aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/Makefile
diff options
context:
space:
mode:
authorWey-Yi Guy2011-10-10 07:27:12 -0700
committerJohn W. Linville2011-10-14 14:48:13 -0400
commitc745f55baf63d08d6e9bb20682102fb8bae8f67a (patch)
tree133dbee0b351a2a8939db350147d98394a74fd59 /drivers/net/wireless/iwlwifi/Makefile
parentade4c649a0e9e862751fe1c98f43fbee86554c8a (diff)
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/Makefile')
-rw-r--r--drivers/net/wireless/iwlwifi/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index bacafa4a5f48..3dfb9df40895 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -6,8 +6,7 @@ iwlwifi-objs += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o
iwlwifi-objs += iwl-agn-tt.o iwl-agn-sta.o
iwlwifi-objs += iwl-core.o iwl-eeprom.o iwl-power.o
-iwlwifi-objs += iwl-rx.o iwl-sta.o
-iwlwifi-objs += iwl-scan.o iwl-led.o
+iwlwifi-objs += iwl-rx.o iwl-scan.o iwl-led.o
iwlwifi-objs += iwl-agn-rxon.o
iwlwifi-objs += iwl-5000.o
iwlwifi-objs += iwl-6000.o