iwlwifi: 3945 unfold iwl-3945-commands.h

This patch unfolds includes of iwl-3945-commands.h
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/iwlwifi/iwl-3945-commands.h

@@ -144,6 +144,11 @@ enum {
 	REPLY_MAX = 0xff
 };
 
+/* Tx rates */
+#define IWL_CCK_RATES	4
+#define IWL_OFDM_RATES	8
+#define IWL_MAX_RATES	(IWL_CCK_RATES + IWL_OFDM_RATES)
+
 /******************************************************************************
  * (0)
  * Commonly used structures and definitions:

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

@@ -75,12 +75,6 @@
  */
 #define IWL_CMD_QUEUE_NUM	4
 
-/* Tx rates */
-#define IWL_CCK_RATES 4
-#define IWL_OFDM_RATES 8
-#define IWL_HT_RATES 0
-#define IWL_MAX_RATES  (IWL_CCK_RATES+IWL_OFDM_RATES+IWL_HT_RATES)
-
 /* Time constants */
 #define SHORT_SLOT_TIME 9
 #define LONG_SLOT_TIME 20
@@ -281,8 +275,6 @@ struct iwl3945_eeprom {
 /* End of EEPROM */
 
 
-#include "iwl-3945-commands.h"
-
 #define PCI_LINK_CTRL      0x0F0
 #define PCI_POWER_SOURCE   0x0C8
 #define PCI_REG_WUM8       0x0E8

drivers/net/wireless/iwlwifi/iwl-3945-led.c

@@ -38,8 +38,8 @@
 #include <linux/etherdevice.h>
 #include <asm/unaligned.h>
 
+#include "iwl-3945-commands.h"
 #include "iwl-3945.h"
-#include "iwl-helpers.h"
 
 
 static const struct {

drivers/net/wireless/iwlwifi/iwl-3945-rs.c

@@ -36,6 +36,7 @@
 
 #include <linux/workqueue.h>
 
+#include "iwl-3945-commands.h"
 #include "iwl-3945.h"
 
 #define RS_NAME "iwl-3945-rs"

drivers/net/wireless/iwlwifi/iwl-3945.c

@@ -40,6 +40,7 @@
 
 #include "iwl-3945-core.h"
 #include "iwl-3945-fh.h"
+#include "iwl-3945-commands.h"
 #include "iwl-3945.h"
 #include "iwl-helpers.h"
 #include "iwl-3945-rs.h"

drivers/net/wireless/iwlwifi/iwl3945-base.c

@@ -47,6 +47,7 @@
 #include <asm/div64.h>
 
 #include "iwl-3945-core.h"
+#include "iwl-3945-commands.h"
 #include "iwl-3945.h"
 #include "iwl-3945-fh.h"
 #include "iwl-helpers.h"