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

[Martin Michlmayr]

Author: tbm
Date: Sat Jan 28 01:25:36 2006
New Revision: 5611

Modified:
   dists/sid/linux-2.6/debian/arch/arm/config.nslu2
   dists/sid/linux-2.6/debian/changelog
Log:
[arm/nslu2] Enable wireless.


Modified: dists/sid/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- dists/sid/linux-2.6/debian/arch/arm/config.nslu2	(original)
+++ dists/sid/linux-2.6/debian/arch/arm/config.nslu2	Sat Jan 28 01:25:36 2006
@@ -446,6 +446,7 @@
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
 
 #
 # Device Drivers
@@ -804,8 +805,38 @@
 #
 # Wireless LAN (non-hamradio)
 #
-# CONFIG_NET_RADIO is not set
-# CONFIG_IPW2200 is not set
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+CONFIG_STRIP=m
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_MONITOR is not set
+# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2200=m
+# CONFIG_AIRO is not set
+CONFIG_HERMES=m
+# CONFIG_PLX_HERMES is not set
+# CONFIG_TMD_HERMES is not set
+# CONFIG_NORTEL_HERMES is not set
+# CONFIG_PCI_HERMES is not set
+CONFIG_ATMEL=m
+# CONFIG_PCI_ATMEL is not set
+
+#
+# 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_PLX is not set
+# CONFIG_HOSTAP_PCI is not set
+CONFIG_NET_WIRELESS=y
 
 #
 # Wan interfaces
@@ -813,14 +844,15 @@
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPP_FILTER=y
-CONFIG_PPPOE=m
-CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_ASYNC=m
-CONFIG_PPP=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
 # CONFIG_SLIP is not set
 # CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
@@ -866,6 +898,7 @@
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
+CONFIG_INPUT_IXP4XX_BEEPER=y
 CONFIG_INPUT_UINPUT=m
 
 #
@@ -1189,6 +1222,7 @@
 CONFIG_USB_ARMLINUX=y
 # CONFIG_USB_EPSON2888 is not set
 CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_ZD1201=m
 # CONFIG_USB_MON is not set
 
 #
@@ -1495,4 +1529,3 @@
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
-CONFIG_INPUT_IXP4XX_BEEPER=y

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat Jan 28 01:25:36 2006
@@ -25,6 +25,7 @@
   * Add input support for the ixp4xx beeper driver (Alessandro Zummo).
   * Add NSLU2 specific portion of ixp4xx beeper driver (Alessandro Zummo).
   * [arm/nslu2] Build PPP as a module.
+  * [arm/nslu2] Enable wireless.
 
  -- Steve Langasek <vorlon at debian.org>  Fri, 27 Jan 2006 13:25:34 -0800