From 16d5b4083a322db3225f71b095a63aa9a616e45f Mon Sep 17 00:00:00 2001
From: John W. Linville <linville@tuxdriver.com>
Date: Mar 05 2012 16:28:28 +0000
Subject: Turn-off CONFIG_B43_BCMA_EXTRA to avoid b43/brcmsmac overlap


---

diff --git a/config-generic b/config-generic
index 2e1f3ad..34f38d1 100644
--- a/config-generic
+++ b/config-generic
@@ -1464,7 +1464,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 9ea5501..673b996 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2401,6 +2401,9 @@ fi
 #    '-'      |  |
 #              '-'
 %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.