summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/Makefile
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2010-12-15 15:10:12 +0100
committerLuciano Coelho <luciano.coelho@nokia.com>2010-12-15 16:09:27 +0100
commit248daa084cee4b212ff4408e9c9b05b3bdc0da0d (patch)
treed525ac39d421a323ec7c8f42356e7844fbff1395 /drivers/net/wireless/wl12xx/Makefile
parentwl12xx: Change TX queue to be per AC (diff)
downloadlinux-248daa084cee4b212ff4408e9c9b05b3bdc0da0d.tar.xz
linux-248daa084cee4b212ff4408e9c9b05b3bdc0da0d.zip
wl12xx_sdio_test: rename files to match current style
Change some file names and Kconfig settings so that this new module matches the new way of using wl12xx instead of wl1271. Also fix SDIO power enabling and disabling to match the latest way of doing it. Cc: Roger Quadros <roger.quadros@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/Makefile')
-rw-r--r--drivers/net/wireless/wl12xx/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index 187678503887..521c0414e52e 100644
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -3,13 +3,14 @@ wl12xx-objs = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
wl12xx_spi-objs = spi.o
wl12xx_sdio-objs = sdio.o
+wl12xx_sdio_test-objs = sdio_test.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
-obj-$(CONFIG_WL1271_SDIO_TEST) += wl1271_sdio_test.o
+obj-$(CONFIG_WL12XX_SDIO_TEST) += wl12xx_sdio_test.o
# small builtin driver bit
obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o