diff --git a/[refs] b/[refs]
index 08911674086b..3abef7362dbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 928f9111662574c1ac1dfa221c4e502ec713aed9
+refs/heads/master: 15e5201dfd4eebfce5e50b068ed40cb5f574fee6
diff --git a/trunk/drivers/staging/brcm80211/Kconfig b/trunk/drivers/staging/brcm80211/Kconfig
index f4cf9b23481e..2d1a29bdc0ee 100644
--- a/trunk/drivers/staging/brcm80211/Kconfig
+++ b/trunk/drivers/staging/brcm80211/Kconfig
@@ -7,6 +7,7 @@ config BRCMSMAC
 	default n
 	depends on PCI
 	depends on WLAN && MAC80211
+	depends on !PPC64 && !PPC32
 	select BRCMUTIL
 	select FW_LOADER
 	select CRC_CCITT
@@ -20,6 +21,7 @@ config BRCMFMAC
 	default n
 	depends on MMC
 	depends on WLAN && CFG80211
+	depends on !PPC64 && !PPC32
 	select BRCMUTIL
 	select FW_LOADER
 	select WIRELESS_EXT