summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/b43/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-14 18:01:56 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-14 18:01:56 +0100
commitb89371621e5bedc84498ced2c5c33976bd1b2f64 (patch)
treeb309919239586e25617a17785b827577b1abb6b5 /drivers/net/wireless/b43/Kconfig
parentsound: add Edirol UA-101 support (diff)
parentALSA: sb_mixer: convert pointer tables to mixer control tables (diff)
downloadlinux-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.xz
linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.zip
Merge branch 'next/isa' into topic/misc
Diffstat (limited to 'drivers/net/wireless/b43/Kconfig')
-rw-r--r--drivers/net/wireless/b43/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 54ea61c15d8b..64c12e1bced3 100644
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -1,6 +1,6 @@
config B43
tristate "Broadcom 43xx wireless support (mac80211 stack)"
- depends on SSB_POSSIBLE && MAC80211 && WLAN_80211 && HAS_DMA
+ depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
select SSB
select FW_LOADER
---help---