iwlwifi: make Makefile more concise

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / Makefile

diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 741ea346a2951360e52e07da683169a4452d3edb..4f3e88b12e3a5d637e3383da4b84924386074861 100644 (file)
--- 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