summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/Makefile
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2008-04-15 06:16:12 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-04-16 21:59:59 +0200
commiteadd3c4b9a90e31d5b6034a8813bfabecbe48681 (patch)
tree08266460ff3743742f783af7504d06ffc97cbe81 /drivers/net/wireless/iwlwifi/Makefile
parentiwl4965: make iwl4965_send_rxon_assoc asynchronous (diff)
downloadlinux-eadd3c4b9a90e31d5b6034a8813bfabecbe48681.tar.xz
linux-eadd3c4b9a90e31d5b6034a8813bfabecbe48681.zip
iwlwifi: make Makefile more concise
Also change CONFIG_IWLCORE_RFKILL to CONFIG_IWLWIFI_RFKILL to be more consistent with other config variables. Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Acked-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/Makefile29
1 files changed, 8 insertions, 21 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 741ea346a295..4f3e88b12e3a 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,26 +1,13 @@
-obj-$(CONFIG_IWLCORE) += iwlcore.o
-iwlcore-objs = iwl-core.o iwl-eeprom.o iwl-hcmd.o
-
-ifeq ($(CONFIG_IWLWIFI_DEBUGFS),y)
- iwlcore-objs += iwl-debugfs.o
-endif
-
-ifeq ($(CONFIG_IWLWIFI_LEDS),y)
- iwlcore-objs += iwl-led.o
-endif
-
-ifeq ($(CONFIG_IWLCORE_RFKILL),y)
- iwlcore-objs += iwl-rfkill.o
-endif
+obj-$(CONFIG_IWLCORE) := iwlcore.o
+iwlcore-objs := iwl-core.o iwl-eeprom.o iwl-hcmd.o
+iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
+iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o
+iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o
obj-$(CONFIG_IWL3945) += iwl3945.o
-iwl3945-objs = iwl3945-base.o iwl-3945.o iwl-3945-rs.o
-
-ifeq ($(CONFIG_IWL3945_LEDS),y)
- iwl3945-objs += iwl-3945-led.o
-endif
-
+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 iwl-sta.o