From c722964a3f8d2891ce07d8f6bdf4d4f72538211a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 9 Jun 2011 13:16:13 -0700 Subject: [PATCH] --- yaml --- r: 254127 b: refs/heads/master c: 15e5201dfd4eebfce5e50b068ed40cb5f574fee6 h: refs/heads/master i: 254125: 2818e11d66fb0c3dfc57d8091a7dec03af4c463f 254123: d0b220e74a3fb9df0539877f9a3d35f67a511955 254119: b48ef315486ac62d2c160639c6a27f9c62506265 254111: 0a3940b4c95fbe329c6fa442c4a27648e49205aa v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/Kconfig | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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