aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/Makefile
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2010-12-15 09:10:12 -0500
committerLuciano Coelho <luciano.coelho@nokia.com>2010-12-15 10:09:27 -0500
commit248daa084cee4b212ff4408e9c9b05b3bdc0da0d (patch)
treed525ac39d421a323ec7c8f42356e7844fbff1395 /drivers/net/wireless/wl12xx/Makefile
parent6742f554db14da94172da9eb1875a1aa944a827f (diff)
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 18767850388..521c0414e52 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 \
3 3
4wl12xx_spi-objs = spi.o 4wl12xx_spi-objs = spi.o
5wl12xx_sdio-objs = sdio.o 5wl12xx_sdio-objs = sdio.o
6wl12xx_sdio_test-objs = sdio_test.o
6 7
7wl12xx-$(CONFIG_NL80211_TESTMODE) += testmode.o 8wl12xx-$(CONFIG_NL80211_TESTMODE) += testmode.o
8obj-$(CONFIG_WL12XX) += wl12xx.o 9obj-$(CONFIG_WL12XX) += wl12xx.o
9obj-$(CONFIG_WL12XX_SPI) += wl12xx_spi.o 10obj-$(CONFIG_WL12XX_SPI) += wl12xx_spi.o
10obj-$(CONFIG_WL12XX_SDIO) += wl12xx_sdio.o 11obj-$(CONFIG_WL12XX_SDIO) += wl12xx_sdio.o
11 12
12obj-$(CONFIG_WL1271_SDIO_TEST) += wl1271_sdio_test.o 13obj-$(CONFIG_WL12XX_SDIO_TEST) += wl12xx_sdio_test.o
13 14
14# small builtin driver bit 15# small builtin driver bit
15obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o 16obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o