[PATCH] bcm43xx: Partially fix PIO code. Add Kconfig option for PIO or DMA mode ...

Signed-off-by: Michael Buesch <mbuesch@freenet.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 3b1363c..5c4d7b4 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -500,23 +500,7 @@ config PRISM54
          will be called prism54.ko.
 
 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.
-
-config BCM43XX_DEBUG
-       bool "Broadcom BCM43xx debugging (RECOMMENDED)"
-       depends on BCM43XX
-       default y
-       ---help---
-         Broadcom 43xx debugging messages.
-         Say Y, because the driver is still very experimental and
-         this will help you get it running.
+source "drivers/net/wireless/bcm43xx/Kconfig"
 
 # yes, this works even when no drivers are selected
 config NET_WIRELESS

diff --cc drivers/net/wireless/bcm43xx/Kconfig
Simple merge

diff --cc drivers/net/wireless/bcm43xx/Makefile
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx.h
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_dma.h
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_main.c
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_pio.c
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_pio.h
Simple merge