Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

b43: add option to avoid duplicating device support with brcmsmac

Signed-off-by: John W. Linville <linville@tuxdriver.com>

+8
+6
drivers/net/wireless/b43/Kconfig
··· 31 31 depends on B43 && BCMA 32 32 default y 33 33 34 + config B43_BCMA_EXTRA 35 + bool "Hardware support that overlaps with the brcmsmac driver" 36 + depends on B43_BCMA 37 + default n if BRCMSMAC || BRCMSMAC_MODULE 38 + default y 39 + 34 40 config B43_SSB 35 41 bool 36 42 depends on B43 && SSB
+2
drivers/net/wireless/b43/main.c
··· 116 116 #ifdef CONFIG_B43_BCMA 117 117 static const struct bcma_device_id b43_bcma_tbl[] = { 118 118 BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS), 119 + #ifdef CONFIG_B43_BCMA_EXTRA 119 120 BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x17, BCMA_ANY_CLASS), 120 121 BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, BCMA_ANY_CLASS), 122 + #endif 121 123 BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS), 122 124 BCMA_CORETABLE_END 123 125 };