---

yaml --- r: 225319 b: refs/heads/master c: b69eb80 h: refs/heads/master i: 225317: daafb0e 225315: 550ab2a 225311: 506f478 v: v3
git-mirror · Dec 15, 2010 · 8c90ed7 · 8c90ed7
1 parent 2646e2d
commit 8c90ed7
Show file tree

Hide file tree

Showing 4 changed files with 521 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb6a6819fad0d71b47577a51709440a9f8441f0a
+refs/heads/master: b69eb80bf7a6922fef8056d42b06124a7de31501
diff --git a/trunk/drivers/net/wireless/wl12xx/Kconfig b/trunk/drivers/net/wireless/wl12xx/Kconfig
@@ -52,6 +52,14 @@ config WL12XX_SDIO
 	  If you choose to build a module, it'll be called wl12xx_sdio.
 	  Say N if unsure.
 
+config WL1271_SDIO_TEST
+	tristate "TI wl1271 SDIO testing support"
+	depends on WL1271 && MMC
+	---help---
+	  This module adds support for the SDIO bus testing with the
+	  TI wl1271 chipset.  Select this if your platform is using
+	  the SDIO bus.
+
 config WL12XX_PLATFORM_DATA
 	bool
 	depends on WL12XX_SDIO != n || WL1251_SDIO != n

diff --git a/trunk/drivers/net/wireless/wl12xx/Makefile b/trunk/drivers/net/wireless/wl12xx/Makefile
@@ -9,5 +9,7 @@ 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
+
 # small builtin driver bit
 obj-$(CONFIG_WL12XX_PLATFORM_DATA)	+= wl12xx_platform_data.o