1 files changed, 13 insertions, 15 deletions

diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index 078b4398ac1f..521c0414e52e 100644
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -1,18 +1,16 @@
-wl1251-objs             = wl1251_main.o wl1251_event.o \
-                          wl1251_tx.o wl1251_rx.o wl1251_ps.o wl1251_cmd.o \
-                          wl1251_acx.o wl1251_boot.o wl1251_init.o \
-                          wl1251_debugfs.o wl1251_io.o
+wl12xx-objs             = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
+                          boot.o init.o debugfs.o scan.o
 
-obj-$(CONFIG_WL1251)    += wl1251.o
-obj-$(CONFIG_WL1251_SPI)        += wl1251_spi.o
-obj-$(CONFIG_WL1251_SDIO)       += wl1251_sdio.o
+wl12xx_spi-objs = spi.o
+wl12xx_sdio-objs        = sdio.o
+wl12xx_sdio_test-objs = sdio_test.o
 
-wl1271-objs             = wl1271_main.o  wl1271_cmd.o wl1271_io.o \
-                          wl1271_event.o wl1271_tx.o  wl1271_rx.o   \
-                          wl1271_ps.o    wl1271_acx.o wl1271_boot.o \
-                          wl1271_init.o  wl1271_debugfs.o wl1271_scan.o
+wl12xx-$(CONFIG_NL80211_TESTMODE)       += testmode.o
+obj-$(CONFIG_WL12XX)                    += wl12xx.o
+obj-$(CONFIG_WL12XX_SPI)                += wl12xx_spi.o
+obj-$(CONFIG_WL12XX_SDIO)               += wl12xx_sdio.o
 
-wl1271-$(CONFIG_NL80211_TESTMODE)       += wl1271_testmode.o
-obj-$(CONFIG_WL1271)    += wl1271.o
-obj-$(CONFIG_WL1271_SPI)        += wl1271_spi.o
-obj-$(CONFIG_WL1271_SDIO)       += wl1271_sdio.o
+obj-$(CONFIG_WL12XX_SDIO_TEST)  += wl12xx_sdio_test.o
+
+# small builtin driver bit
+obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wl12xx_platform_data.o