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

Commit 70e5e983 authored by John W. Linville's avatar John W. Linville
Browse files

[PATCH] bcm43xx: patch Kconfig and wireless/Makefile for import 



Patch Kconfig and wireless/Makefile to merge bcm43xx 'properly'

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

drivers/net/wireless/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -501,6 +501,14 @@ config PRISM54 


source "drivers/net/wireless/hostap/Kconfig"



config BCM43XX

       tristate "Broadcom BCM43xx wireless support"

       depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL

	select FW_LOADER

       ---help---

	This is an experimental driver for the Broadcom 43xx wireless chip,

	found in the Apple Airport Extreme and various other devices.



# yes, this works even when no drivers are selected

config NET_WIRELESS

	bool

drivers/net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o 
obj-$(CONFIG_PRISM54)		+= prism54/



obj-$(CONFIG_HOSTAP)		+= hostap/

obj-$(CONFIG_BCM43XX)		+= bcm43xx/



# 16-bit wireless PCMCIA client drivers

obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o