summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-1000.c
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-10-10 07:27:12 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-10-14 14:48:13 -0400
commitc745f55baf63d08d6e9bb20682102fb8bae8f67a (patch)
tree133dbee0b351a2a8939db350147d98394a74fd59 /drivers/net/wireless/iwlwifi/iwl-1000.c
parentade4c649a0e9e862751fe1c98f43fbee86554c8a (diff)
downloadlinux-c745f55baf63d08d6e9bb20682102fb8bae8f67a.tar.bz2
iwlagn: merge station management functions
After driver split, no need to separate station management functions in two files, merge it Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-1000.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index dfd81debc32e..0bf6afd8e657 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -39,7 +39,6 @@
#include "iwl-dev.h"
#include "iwl-core.h"
#include "iwl-io.h"
-#include "iwl-sta.h"
#include "iwl-agn.h"
#include "iwl-helpers.h"
#include "iwl-agn-hw.h"