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 1a2141dabdc7a533cb9382773b674ddbe7a270bd..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
@@ -32,6 +32,7 @@ config B43_PCI_AUTOSELECT
        bool
        depends on B43 && SSB_PCIHOST_POSSIBLE
        select SSB_PCIHOST
+       select SSB_B43_PCI_BRIDGE
        default y
 
 # Auto-select SSB PCICORE driver, if possible
@@ -61,6 +62,14 @@ config B43_PCMCIA
 
          If unsure, say N.
 
+# Data transfers to the device via PIO
+# This is only needed on PCMCIA devices. All others can do DMA properly.
+config B43_PIO
+       bool
+       depends on B43 && (B43_PCMCIA || B43_FORCE_PIO)
+       select SSB_BLOCKIO
+       default y
+
 config B43_NPHY
        bool "Pre IEEE 802.11n support (BROKEN)"
        depends on B43 && EXPERIMENTAL && BROKEN
@@ -93,3 +102,13 @@ config B43_DEBUG
 
          Say Y, if you want to find out why the driver does not
          work for you.
+
+config B43_FORCE_PIO
+       bool "Force usage of PIO instead of DMA"
+       depends on B43 && B43_DEBUG
+       ---help---
+         This will disable DMA and always enable PIO instead.
+
+         Say N!
+         This is only for debugging the PIO engine code. You do
+         _NOT_ want to enable this.