diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-11 15:50:15 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-18 14:49:47 -0500 |
| commit | 4f3d09de38d234ce7ffba5ec5a7e6704f983d375 (patch) | |
| tree | 5c5d9d1bbf557461d05e1a4761470ecac8fc8fa2 /drivers/net | |
| parent | bc4934bc61d0a11fd62c5187ff83645628f8be8b (diff) | |
| download | linux-3.10-4f3d09de38d234ce7ffba5ec5a7e6704f983d375.tar.gz linux-3.10-4f3d09de38d234ce7ffba5ec5a7e6704f983d375.tar.bz2 linux-3.10-4f3d09de38d234ce7ffba5ec5a7e6704f983d375.zip | |
b43: add option to avoid duplicating device support with brcmsmac
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/b43/Kconfig | 6 | ||||
| -rw-r--r-- | 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 b97a40ed5ff..3876c7ea54f 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 b91f28ef103..23ffb1b9a86 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 }; |