From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 24 Nov 2011 07:45:52 +0000
Subject: [PATCH] bcma: Do not claim PCI device IDs also claimed by brcmsmac

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/bcma/host_pci.c                |    4 +++-
 drivers/net/wireless/brcm80211/Kconfig |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 1b51d8b..1f43cd4 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -225,11 +225,13 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
 }
 
 static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
+#if !IS_ENABLED(CONFIG_BRCMSMAC)
    { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
-   { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
    { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
    { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
    { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
+#endif
+   { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
    { 0, },
 };
 MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig
index 2069fc8..d5784ee 100644
--- a/drivers/net/wireless/brcm80211/Kconfig
+++ b/drivers/net/wireless/brcm80211/Kconfig
@@ -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
--
1.7.7.3