diff options
| author |   Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-10-10 07:27:12 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:13 -0400 |
| commit | c745f55baf63d08d6e9bb20682102fb8bae8f67a (patch) | |
| tree | 133dbee0b351a2a8939db350147d98394a74fd59 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
| parent | iwlagn: rename all the mac80211 callback functions (diff) | |
| download | linux-dev-c745f55baf63d08d6e9bb20682102fb8bae8f67a.tar.xz linux-dev-c745f55baf63d08d6e9bb20682102fb8bae8f67a.zip | |
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-6000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 4abfcf2f257c..aece578226c6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.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" |