summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-03-05 11:28:28 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-05 11:33:07 -0500
commit18b1cc892930d9b3947111562c32ef50728ac15d (patch)
tree7e242695e47b095141534d2d256d7705dfa90238 /config-generic
parentec9ad688ad79b354ae8223a58b96203b2d1116a8 (diff)
downloadkernel-18b1cc892930d9b3947111562c32ef50728ac15d.tar.gz
kernel-18b1cc892930d9b3947111562c32ef50728ac15d.tar.xz
kernel-18b1cc892930d9b3947111562c32ef50728ac15d.zip
Turn-off CONFIG_B43_BCMA_EXTRA to avoid b43/brcmsmac overlap
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 105726e35..8c9dcdb44 100644
--- a/config-generic
+++ b/config-generic
@@ -1462,7 +1462,7 @@ CONFIG_B43=m
CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_BCMA=y
-CONFIG_B43_BCMA_EXTRA=y
+# CONFIG_B43_BCMA_EXTRA is not set
CONFIG_B43_BCMA_PIO=y
CONFIG_B43_DEBUG=y
CONFIG_B43_PHY_LP=y