enable b43, b43legacy - replacing bcm43xxx

thus disable bcm43xxx, kill corresponding arm disable config patch

svn path=/dists/trunk/linux-2.6/; revision=9837

debian/changelog

@@ -10,8 +10,10 @@ linux-2.6 (2.6.24~rc3-1~experimental.1) UNRELEASED; urgency=low
     DVB_S5H1409, DVB_TUNER_MT2131, INET_LRO, MMC_RICOH_MMC, MMC_SPI,
     RTC_DRV_DS1374.
   * Disable smbfs in topconfig, not supported upstream, use cifs.
+  * Disable bcm43xx, deprecated by upstream. Enable B43 (needs v4 firmware)
+    and B43LEGACY (needs v3 firmware).
 
- -- maximilian attems <maks@debian.org>  Wed, 28 Nov 2007 14:42:51 +0100
+ -- maximilian attems <maks@debian.org>  Thu, 29 Nov 2007 22:19:29 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 

debian/config/config

@@ -1642,13 +1642,9 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
 CONFIG_HOSTAP_PLX=m
-CONFIG_BCM43XX=m
-CONFIG_BCM43XX_DEBUG=y
-CONFIG_BCM43XX_DMA=y
-CONFIG_BCM43XX_PIO=y
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
-# CONFIG_BCM43XX_DMA_MODE is not set
-# CONFIG_BCM43XX_PIO_MODE is not set
+# CONFIG_BCM43XX is not set
+CONFIG_B43=m
+CONFIG_B43LEGACY=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_RT2X00=m

debian/patches/bugfix/arm/disable-bcm43xx.patch

@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/bcm43xx/Kconfig	2007-09-27 12:50:43.000000000 +0000
-+++ b/drivers/net/wireless/bcm43xx/Kconfig	2007-09-27 12:51:08.000000000 +0000
-@@ -1,6 +1,6 @@
- config BCM43XX
- 	tristate "Broadcom BCM43xx wireless support"
--	depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL
-+	depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL && (!ARM || BROKEN)
- 	select WIRELESS_EXT
- 	select FW_LOADER
- 	select HW_RANDOM

debian/patches/series/1~experimental.1

@@ -36,5 +36,4 @@
 + bugfix/arm/disable-netxen_nic.patch
 + bugfix/arm/disable-chelsio_t3.patch
 + bugfix/arm/disable-video_bt848.patch
-+ bugfix/arm/disable-bcm43xx.patch
 + bugfix/arm/disable-scsi_acard.patch