Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

[linux-2.6] / drivers / net / wireless / b43 / Kconfig

diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig
index fdbc351..f51b2d9 100644 (file)
--- a/drivers/net/wireless/b43/Kconfig
+++ b/drivers/net/wireless/b43/Kconfig
@@ -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,24 @@ 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
+       ---help---
+         Support for the IEEE 802.11n draft.
+
+         THIS IS BROKEN AND DOES NOT WORK YET.
+
+         SAY N.
+
 # This config option automatically enables b43 LEDS support,
 # if it's possible.
 config B43_LEDS
@@ -84,50 +103,12 @@ config B43_DEBUG
          Say Y, if you want to find out why the driver does not
          work for you.
 
-config B43_DMA
-       bool
-       depends on B43
-config B43_PIO
-       bool
-       depends on B43
-
-choice
-       prompt "Broadcom 43xx data transfer mode"
-       depends on B43
-       default B43_DMA_AND_PIO_MODE
-
-config B43_DMA_AND_PIO_MODE
-       bool "DMA + PIO"
-       select B43_DMA
-       select B43_PIO
+config B43_FORCE_PIO
+       bool "Force usage of PIO instead of DMA"
+       depends on B43 && B43_DEBUG
        ---help---
-         Include both, Direct Memory Access (DMA) and Programmed I/O (PIO)
-         data transfer modes.
-         The actually used mode is selectable through the module
-         parameter "pio". If the module parameter is pio=0, DMA is used.
-         Otherwise PIO is used. DMA is default.
-
-         If unsure, choose this option.
-
-config B43_DMA_MODE
-       bool "DMA (Direct Memory Access) only"
-       select B43_DMA
-       ---help---
-         Only include Direct Memory Access (DMA).
-         This reduces the size of the driver module, by omitting the PIO code.
-
-config B43_PIO_MODE
-       bool "PIO (Programmed I/O) only"
-       select B43_PIO
-       ---help---
-         Only include Programmed I/O (PIO).
-         This reduces the size of the driver module, by omitting the DMA code.
-         Please note that PIO transfers are slow (compared to DMA).
-
-         Also note that not all devices of the 43xx series support PIO.
-         The 4306 (Apple Airport Extreme and others) supports PIO, while
-         the 4318 is known to _not_ support PIO.
-
-         Only use PIO, if DMA does not work for you.
+         This will disable DMA and always enable PIO instead.
 
-endchoice
+         Say N!
+         This is only for debugging the PIO engine code. You do
+         _NOT_ want to enable this.