Merge commit 'gcl/gcl-next'

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / b43 / Kconfig

diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index 94f04559028baf554d38cf7398b64d6c100c7d25..1fa043d1802ca3f942e02e04bec01543bbc178cf 100644 (file)
--- 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
+       depends on SSB_POSSIBLE && MAC80211 && WLAN_80211 && HAS_DMA
        select SSB
        select FW_LOADER
        select HW_RANDOM
@@ -67,6 +67,7 @@ config B43_PCMCIA
 config B43_PIO
        bool
        depends on B43 && (B43_PCMCIA || B43_FORCE_PIO)
+       select SSB_BLOCKIO
        default y
 
 config B43_NPHY