[kernel] r9837 - in dists/trunk/linux-2.6/debian: . config patches/bugfix/arm patches/series

[Maximilian Attems]

Author: maks
Date: Thu Nov 29 21:25:28 2007
New Revision: 9837

Log:
enable b43, b43legacy - replacing bcm43xxx
thus disable bcm43xxx, kill corresponding arm disable config patch


Removed:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-bcm43xx.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Nov 29 21:25:28 2007
@@ -10,8 +10,10 @@
     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 at debian.org>  Wed, 28 Nov 2007 14:42:51 +0100
+ -- maximilian attems <maks at debian.org>  Thu, 29 Nov 2007 22:19:29 +0100
 
 linux-2.6 (2.6.23-1~experimental.1) UNRELEASED; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Nov 29 21:25:28 2007
@@ -1642,13 +1642,9 @@
 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

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Nov 29 21:25:28 2007
@@ -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