iwlwifi: move rate registration to module load

[linux-2.6] / drivers / net / wireless / iwlwifi / Makefile

diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 03837ff54312beb4a035a6d420fd091024514b24..2751e8aa97d7f816abdb2315b83935ae27bb6af1 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,11 +1,26 @@
+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_IWL3945)  += iwl3945.o
 iwl3945-objs           = iwl3945-base.o iwl-3945.o iwl-3945-rs.o
-CFLAGS_iwl3945-base.o  = -DIWL=3945
-CFLAGS_iwl-3945.o      = -DIWL=3945
-CFLAGS_iwl-3945-rs.o   = -DIWL=3945
+
+ifeq ($(CONFIG_IWL3945_LEDS),y)
+       iwl3945-objs += iwl-3945-led.o
+endif
+
 
 obj-$(CONFIG_IWL4965)  += iwl4965.o
 iwl4965-objs           = iwl4965-base.o iwl-4965.o iwl-4965-rs.o
-CFLAGS_iwl4965-base.o  = -DIWL=4965
-CFLAGS_iwl-4965.o      = -DIWL=4965
-CFLAGS_iwl-4965-rs.o   = -DIWL=4965
+