diff options
Diffstat (limited to 'freed-ora/tags/f16/3.2.3-2.fc16/b43-add-option-to-avoid-duplicating-device-support-w.patch')
| -rw-r--r-- | freed-ora/tags/f16/3.2.3-2.fc16/b43-add-option-to-avoid-duplicating-device-support-w.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/freed-ora/tags/f16/3.2.3-2.fc16/b43-add-option-to-avoid-duplicating-device-support-w.patch b/freed-ora/tags/f16/3.2.3-2.fc16/b43-add-option-to-avoid-duplicating-device-support-w.patch new file mode 100644 index 000000000..ca820dfe0 --- /dev/null +++ b/freed-ora/tags/f16/3.2.3-2.fc16/b43-add-option-to-avoid-duplicating-device-support-w.patch @@ -0,0 +1,47 @@ +From 4f3d09de38d234ce7ffba5ec5a7e6704f983d375 Mon Sep 17 00:00:00 2001 +From: John W. Linville <linville@tuxdriver.com> +Date: Wed, 11 Jan 2012 15:50:15 -0500 +Subject: [PATCH 5/8] b43: add option to avoid duplicating device support with + brcmsmac + +Signed-off-by: John W. Linville <linville@tuxdriver.com> +--- + drivers/net/wireless/b43/Kconfig | 6 ++++++ + drivers/net/wireless/b43/main.c | 2 ++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig +index b97a40e..3876c7e 100644 +--- a/drivers/net/wireless/b43/Kconfig ++++ b/drivers/net/wireless/b43/Kconfig +@@ -31,6 +31,12 @@ config B43_BCMA + depends on B43 && BCMA + default y + ++config B43_BCMA_EXTRA ++ bool "Hardware support that overlaps with the brcmsmac driver" ++ depends on B43_BCMA ++ default n if BRCMSMAC || BRCMSMAC_MODULE ++ default y ++ + config B43_SSB + bool + depends on B43 && SSB +diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c +index b91f28e..23ffb1b 100644 +--- a/drivers/net/wireless/b43/main.c ++++ b/drivers/net/wireless/b43/main.c +@@ -116,8 +116,10 @@ MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO"); + #ifdef CONFIG_B43_BCMA + static const struct bcma_device_id b43_bcma_tbl[] = { + BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS), ++#ifdef CONFIG_B43_BCMA_EXTRA + BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS), + BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS), ++#endif + BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS), + BCMA_CORETABLE_END + }; +-- +1.7.4.4 + |
