Do not disable BRCMSMAC if BCMA is enabled
svn path=/dists/trunk/linux-2.6/; revision=18345
This commit is contained in:
parent
94ef22ed4b
commit
ddc1a60a16
|
@ -4,14 +4,15 @@ 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 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
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 ac4bc62..e75e78d 100644
|
||||
index 1b51d8b..1f43cd4 100644
|
||||
--- a/drivers/bcma/host_pci.c
|
||||
+++ b/drivers/bcma/host_pci.c
|
||||
@@ -224,11 +224,13 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
|
||||
@@ -225,11 +225,13 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
|
||||
}
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
|
||||
|
@ -26,6 +27,18 @@ index ac4bc62..e75e78d 100644
|
|||
{ 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
|
||||
|
||||
|
|
Loading…
Reference in New Issue