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

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

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
John W. Linville 2006-01-23 17:00:39 -05:00
parent f222313a61
commit 70e5e983f8
2 changed files with 9 additions and 0 deletions

View File

@ -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

View File

@ -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