diff --git a/[refs] b/[refs]
index 5592b63f4dbf..ecfde678b568 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 687c8ff12df6b469c662a6cc288ea35989ee0704
+refs/heads/master: 7c3c76a82f3a6d52bbeabf48dd32109cc951a7cf
diff --git a/trunk/drivers/net/wireless/wl12xx/Kconfig b/trunk/drivers/net/wireless/wl12xx/Kconfig
index 2f6733526f7f..337fc7bec5a5 100644
--- a/trunk/drivers/net/wireless/wl12xx/Kconfig
+++ b/trunk/drivers/net/wireless/wl12xx/Kconfig
@@ -53,7 +53,7 @@ config WL1271
 	  unsure.
 
 config WL1271_SPI
-	tristate "TI wl1251 SPI support"
+	tristate "TI wl1271 SPI support"
 	depends on WL1271 && SPI_MASTER
 	---help---
 	  This module adds support for the SPI interface of adapters using
@@ -65,7 +65,7 @@ config WL1271_SPI
 
 config WL1271_SDIO
 	tristate "TI wl1271 SDIO support"
-	depends on WL1271 && MMC
+	depends on WL1271 && MMC && ARM
 	---help---
 	  This module adds support for the SDIO interface of adapters using
 	  TI wl1271 chipset.  Select this if your platform is using