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
diff --git a/kernel.spec b/kernel.spec
index f557632b0..f250ce99a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2391,6 +2391,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Mar 05 2012 John W. Linville <linville@redhat.com>
+- Turn-off CONFIG_B43_BCMA_EXTRA to avoid b43/brcmsmac overlap
+
 * Mon Mar 05 2012 Mark Wielaard <mark@klomp.org>
 - Add -r to debuginfo_args to invoke eu-strip --reloc-debug-sections.