aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/Makefile
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-05-05 10:22:44 +0800
committerJohn W. Linville <linville@tuxdriver.com>2008-05-14 16:29:46 -0400
commit27aaba0ca099461badb496bf7cde5ab5cdc89b98 (patch)
treec68ae0c689fd5632548aee68005ce6bd0975ac63 /drivers/net/wireless/iwlwifi/Makefile
parent1053d35f4ed6876ad9d3a14cdae363db0a7e9b0a (diff)
downloadkernel_samsung_aries-27aaba0ca099461badb496bf7cde5ab5cdc89b98.zip
kernel_samsung_aries-27aaba0ca099461badb496bf7cde5ab5cdc89b98.tar.gz
kernel_samsung_aries-27aaba0ca099461badb496bf7cde5ab5cdc89b98.tar.bz2
iwlwifi: compile iwl-sta into iwlcore
This patch moves iwl-sta into iwl-core. Signed-off-by: Tomas Winkler <tomas.winkler@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/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 85c8bf6..5c73eed 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,6 +1,6 @@
obj-$(CONFIG_IWLCORE) += iwlcore.o
iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
-iwlcore-objs += iwl-rx.o iwl-tx.o
+iwlcore-objs += iwl-rx.o iwl-tx.o iwl-sta.o
iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o
iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o
@@ -11,7 +11,7 @@ iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o
iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.o
obj-$(CONFIG_IWL4965) += iwl4965.o
-iwl4965-objs := iwl4965-base.o iwl-4965.o iwl-4965-rs.o iwl-sta.o
+iwl4965-objs := iwl4965-base.o iwl-4965.o iwl-4965-rs.o
ifeq ($(CONFIG_IWL5000),y)
iwl4965-objs += iwl-5000.o