aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/Makefile
diff options
context:
space:
mode:
authorShahar Levi <shahar_levi@ti.com>2011-09-12 03:00:37 -0400
committerLuciano Coelho <coelho@ti.com>2011-09-23 07:11:31 -0400
commitd3b104ae22a761dbec8410e6e66ac048c9ff9b5f (patch)
treefef3c96d8c375d184d6a830c0a38d7ddd977beec /drivers/net/wireless/wl12xx/Makefile
parent6cd9d21a0c1e2648c07c32c66bb25795ad3208aa (diff)
wl12xx: fix sdio_test module functionality
Due to some changes in PM in recent kernels, the sdio_test module has been broken for a while. This patch fixes the code that powers the card on and off. Also made some small indentation fixes in the Makefile. [Rephrased commit log and removed the change in the FW name, since it's done in another patch. -- Luca] Signed-off-by: Shahar Levi <shahar_levi@ti.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/Makefile')
-rw-r--r--drivers/net/wireless/wl12xx/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index 521c0414e52e..621b3483ca2c 100644
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -1,16 +1,16 @@
1wl12xx-objs = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \ 1wl12xx-objs = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
2 boot.o init.o debugfs.o scan.o 2 boot.o init.o debugfs.o scan.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 6wl12xx_sdio_test-objs = sdio_test.o
7 7
8wl12xx-$(CONFIG_NL80211_TESTMODE) += testmode.o 8wl12xx-$(CONFIG_NL80211_TESTMODE) += testmode.o
9obj-$(CONFIG_WL12XX) += wl12xx.o 9obj-$(CONFIG_WL12XX) += wl12xx.o
10obj-$(CONFIG_WL12XX_SPI) += wl12xx_spi.o 10obj-$(CONFIG_WL12XX_SPI) += wl12xx_spi.o
11obj-$(CONFIG_WL12XX_SDIO) += wl12xx_sdio.o 11obj-$(CONFIG_WL12XX_SDIO) += wl12xx_sdio.o
12 12
13obj-$(CONFIG_WL12XX_SDIO_TEST) += wl12xx_sdio_test.o 13obj-$(CONFIG_WL12XX_SDIO_TEST) += wl12xx_sdio_test.o
14 14
15# small builtin driver bit 15# small builtin driver bit
16obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o 16obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o