Simple patch to remove the overlap between the bcma (i.e. b43) driver

and the brcmsmac driver.  David Woodhouse <dwmw2@infradead.org>

confirmed that this patch restores functionality of bcm4331 devices.

-- John W. Linville <linville@redhat.com>

diff -up linux-3.1.x86_64/drivers/bcma/host_pci.c.orig linux-3.1.x86_64/drivers/bcma/host_pci.c

--- linux-3.1.x86_64/drivers/bcma/host_pci.c.orig	2011-11-10 11:41:26.829742757 -0500

+++ linux-3.1.x86_64/drivers/bcma/host_pci.c	2011-11-10 11:41:22.884792078 -0500

@@ -225,11 +225,13 @@ static void bcma_host_pci_remove(struct 

 }

 static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {

-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },

 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },

+#if 0 /* Not in Fedora... */

+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },

 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },

 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },

 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

+#endif

 	{ 0, },

 };

 MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);

diff -up linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig.orig linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig

--- linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig.orig	2011-11-10 11:42:31.764930961 -0500

+++ linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig	2011-11-10 11:42:33.613907846 -0500

@@ -5,7 +5,6 @@ config BRCMSMAC

 	tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"

 	depends on PCI

 	depends on MAC80211

-	depends on BCMA=n

 	select BRCMUTIL

 	select FW_LOADER

 	select CRC_CCITT