Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3d09de authored by John W. Linville's avatar John W. Linville
Browse files

b43: add option to avoid duplicating device support with brcmsmac 



Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bc4934bc

drivers/net/wireless/b43/Kconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,12 @@ config B43_BCMA 
	depends on B43 && BCMA

	depends on B43 && BCMA

	default y

	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

config B43_SSB

	bool

	bool

	depends on B43 && SSB

	depends on B43 && SSB

drivers/net/wireless/b43/main.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -116,8 +116,10 @@ MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO"); 
#ifdef CONFIG_B43_BCMA

#ifdef CONFIG_B43_BCMA

static const struct bcma_device_id b43_bcma_tbl[] = {

static const struct bcma_device_id b43_bcma_tbl[] = {

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x11, BCMA_ANY_CLASS),

	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, 0x17, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x18, 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_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 0x1D, BCMA_ANY_CLASS),

	BCMA_CORETABLE_END

	BCMA_CORETABLE_END

};

};