From 329853ec715e25f1365035da3b936d3fc28976c7 Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Fri, 19 Dec 2008 10:37:02 +0800
Subject: [PATCH] --- yaml --- r: 133992 b: refs/heads/master c:
 69d00d2722e7478e590e40b1a8b791b4aeea195f h: refs/heads/master v: v3

---
 [refs]                                                 |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-3945-commands.h |  5 +++++
 trunk/drivers/net/wireless/iwlwifi/iwl-3945-hw.h       | 10 +---------
 trunk/drivers/net/wireless/iwlwifi/iwl-3945-led.c      |  2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c       |  1 +
 trunk/drivers/net/wireless/iwlwifi/iwl-3945.c          |  1 +
 trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c      |  1 +
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index e84777552ce9..99331d9e20a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bddadf86fb284f237d6e2d3496772c8f5c68370e
+refs/heads/master: 69d00d2722e7478e590e40b1a8b791b4aeea195f
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-commands.h b/trunk/drivers/net/wireless/iwlwifi/iwl-3945-commands.h
index c6f4eb54a2b1..e9ccd07db8d4 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-commands.h
+++ b/trunk/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:
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/trunk/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
index 1df385b7c39e..21719eb7e144 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
@@ -73,13 +73,7 @@
  * uCode queue management definitions ...
  * Queue #4 is the command queue for 3945 and 4965.
  */
-#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)
+#define IWL_CMD_QUEUE_NUM	4
 
 /* Time constants */
 #define SHORT_SLOT_TIME 9
@@ -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
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-led.c b/trunk/drivers/net/wireless/iwlwifi/iwl-3945-led.c
index 4c638909a7db..b0d420f68ec4 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-led.c
+++ b/trunk/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 {
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index 21c841847d88..56226032333a 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/trunk/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"
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c b/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c
index f4fee0a91b66..5a316d501c32 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/trunk/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"
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
index fee3e93ca564..541cdbe8172f 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/trunk/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"