---

yaml
---
r: 184479
b: refs/heads/master
c: 4a6547c
h: refs/heads/master
i:
  184477: 85fec8e
  184475: e16f7c5
  184471: fa6ebd1
  184463: 3f13afd
  184447: 74163b7
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c0ba62fd4b2dce08055a89600f1d834f9f0fe9e
+refs/heads/master: 4a6547c748229ba0425713b4adeb0f2d4000da9e

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

@@ -45,8 +45,8 @@
 #include "iwl-sta.h"
 #include "iwl-3945.h"
 #include "iwl-eeprom.h"
-#include "iwl-helpers.h"
 #include "iwl-core.h"
+#include "iwl-helpers.h"
 #include "iwl-led.h"
 #include "iwl-3945-led.h"
 

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

@@ -171,24 +171,6 @@ struct iwl3945_frame {
 
 #define SCAN_INTERVAL 100
 
-#define STATUS_HCMD_ACTIVE	0	/* host command in progress */
-#define STATUS_HCMD_SYNC_ACTIVE	1	/* sync host command in progress */
-#define STATUS_INT_ENABLED	2
-#define STATUS_RF_KILL_HW	3
-#define STATUS_INIT		5
-#define STATUS_ALIVE		6
-#define STATUS_READY		7
-#define STATUS_TEMPERATURE	8
-#define STATUS_GEO_CONFIGURED	9
-#define STATUS_EXIT_PENDING	10
-#define STATUS_STATISTICS	12
-#define STATUS_SCANNING		13
-#define STATUS_SCAN_ABORTING	14
-#define STATUS_SCAN_HW		15
-#define STATUS_POWER_PMI	16
-#define STATUS_FW_ERROR		17
-#define STATUS_CONF_PENDING	18
-
 #define MAX_TID_COUNT        9
 
 #define IWL_INVALID_RATE     0xFF

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

@@ -53,8 +53,8 @@
 #include "iwl-commands.h"
 #include "iwl-sta.h"
 #include "iwl-3945.h"
-#include "iwl-helpers.h"
 #include "iwl-core.h"
+#include "iwl-helpers.h"
 #include "iwl-dev.h"
 #include "iwl-spectrum.h"