[kernel] r8096 - in dists/sid/linux-2.6/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Thu Jan  4 23:46:09 2007
New Revision: 8096

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.iop32x
   dists/sid/linux-2.6/debian/changelog
Log:
arm/iop32x: Enable CONFIG_IEEE80211_SOFTMAC and drivers based
on it (plus some other wifi changes)


Modified: dists/sid/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.iop32x	Thu Jan  4 23:46:09 2007
@@ -482,7 +482,8 @@
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 # CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -914,16 +915,26 @@
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
-# CONFIG_PCI_ATMEL is not set
+CONFIG_PCI_ATMEL=m
 
 #
 # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
 #
 # CONFIG_PRISM54 is not set
 CONFIG_HOSTAP=m
-# CONFIG_HOSTAP_FIRMWARE is not set
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_PLX=m
-# CONFIG_HOSTAP_PCI is not set
+CONFIG_HOSTAP_PCI=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_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_NET_WIRELESS=y
 
 #

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Jan  4 23:46:09 2007
@@ -15,6 +15,8 @@
     (closes: #402876) and possibly dm-crypt/LUKS (see #403426).
   * arm: Turn off PCI burst on the Cyber2010, otherwise X11 on
     Netwinder will crash.
+  * arm/iop32x: Enable CONFIG_IEEE80211_SOFTMAC and drivers based
+    on it.
 
   [ Bastian Blank ]
   * Bump ABI to 4.