iwlegacy: merge common .c files

[mirror_ubuntu-artful-kernel.git] / drivers / net / wireless / iwlegacy / Makefile

diff --git a/drivers/net/wireless/iwlegacy/Makefile b/drivers/net/wireless/iwlegacy/Makefile
index cd8ac73d45bff3188f1d5049e69b8263636d99e7..413213b0e9742876207f8c27a7599f92d14f7f52 100644 (file)
--- a/drivers/net/wireless/iwlegacy/Makefile
+++ b/drivers/net/wireless/iwlegacy/Makefile
@@ -1,22 +1,17 @@
 obj-$(CONFIG_IWLEGACY) += iwl-legacy.o
-iwl-legacy-objs                := iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
-iwl-legacy-objs                += iwl-rx.o iwl-tx.o iwl-sta.o
-iwl-legacy-objs                += iwl-scan.o iwl-led.o
+iwl-legacy-objs                := common.o
 iwl-legacy-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-debugfs.o
 
 iwl-legacy-objs += $(iwl-legacy-m)
 
 # 4965
 obj-$(CONFIG_IWL4965)  += iwl4965.o
-iwl4965-objs           := 4965.o 4965-mac.o iwl-4965-rs.o iwl-4965-led.o
-iwl4965-objs           += iwl-4965-ucode.o iwl-4965-tx.o
-iwl4965-objs           += iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o
-iwl4965-objs           += iwl-4965-sta.o iwl-4965-eeprom.o
-iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-4965-debugfs.o
+iwl4965-objs           := 4965.o 4965-mac.o 4965-rs.o 4965-calib.o
+iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += 4965-debug.o
 
 # 3945
 obj-$(CONFIG_IWL3945)  += iwl3945.o
-iwl3945-objs           := 3945-mac.o 3945.o iwl-3945-rs.o iwl-3945-led.o
-iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-3945-debugfs.o
+iwl3945-objs           := 3945-mac.o 3945.o 3945-rs.o
+iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += 3945-debug.o
 
 ccflags-y += -D__CHECK_ENDIAN__