diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-01-25 11:57:01 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-01-25 11:57:01 -0500 |
| commit | 64d09e6b046b02d725ba859b728c6f22c4a08dee (patch) | |
| tree | 6d8f64732aae914f4ad544d37a6bd998f1433be9 /bcma-brcmsmac-compat.patch | |
| parent | d5f748edcbaf363a40a59a2069a4acbc37422f20 (diff) | |
| download | kernel-64d09e6b046b02d725ba859b728c6f22c4a08dee.tar.gz kernel-64d09e6b046b02d725ba859b728c6f22c4a08dee.tar.xz kernel-64d09e6b046b02d725ba859b728c6f22c4a08dee.zip | |
Linux 3.3-rc1-git2 (upstream f8275f9694b8adf9f3498e747ea4c3e8b984499b)
Diffstat (limited to 'bcma-brcmsmac-compat.patch')
| -rw-r--r-- | bcma-brcmsmac-compat.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/bcma-brcmsmac-compat.patch b/bcma-brcmsmac-compat.patch deleted file mode 100644 index aaa7a61d3..000000000 --- a/bcma-brcmsmac-compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/brcm80211/Kconfig -index cd6375d..caa0302 100644 ---- a/drivers/net/wireless/brcm80211/Kconfig -+++ b/drivers/net/wireless/brcm80211/Kconfig -@@ -4,7 +4,6 @@ config BRCMUTIL - config BRCMSMAC - tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" - depends on MAC80211 -- depends on BCMA - select BRCMUTIL - select FW_LOADER - select CRC_CCITT |