commit 4a6547c748229ba0425713b4adeb0f2d4000da9e
author Reinette Chatre <reinette.chatre@intel.com> Thu Feb 18 22:03:02 2010 -0800
committer John W. Linville <linville@tuxdriver.com> Fri Feb 19 15:52:49 2010 -0500
tree 257c45169b278fd9e49cb629afb53763a334ceea
parent 5c0ba62fd4b2dce08055a89600f1d834f9f0fe9e

iwl3945: remove STATUS macros from header

iwl3945 includes iwl-core.h in which these STATUS flags are already
defined. This also removes a potential confusing definition with iwlcore
using STATUS_MODE_PENDING with value 18 and iwl3945 defining (but not
using) STATUS_CONF_PENDING for value 18.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

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

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 3df488a..0e5a1ca 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/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"