* group wlan devices

* enable new libertas wlan device
* enable new network devices dgrs, sc92031 

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

debian/arch/config

@@ -996,8 +996,6 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 
 # CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_LXT_PHY=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_HOSTAP_PCI=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_FUSE_FS=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
@@ -1006,7 +1004,6 @@ CONFIG_VIDEO_SELECT=y
 CONFIG_CRC16=m
 CONFIG_IP_DCCP=m
 CONFIG_IP_DCCP_TFRC_LIB=m
-CONFIG_HOSTAP_CS=m
 CONFIG_SIS190=m
 CONFIG_SND_AD1889=m
 CONFIG_INET_TCP_DIAG=m
@@ -1028,18 +1025,13 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_MARVELL_PHY=m
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_USB_NET_GL620A=m
-CONFIG_HOSTAP_PLX=m
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_USB_NET_PLUSB=m
 # CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_HOSTAP=m
-CONFIG_IPW2200=m
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_IP_DCCP_CCID3=m
 CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_NORTEL_HERMES=m
 CONFIG_CICADA_PHY=m
 CONFIG_QSEMI_PHY=m
 CONFIG_USB_NET_ZAURUS=m
@@ -1057,7 +1049,6 @@ CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_FUSION=y
 # CONFIG_NET_POCKET is not set
 CONFIG_MII=m
-CONFIG_AIRO=m
 CONFIG_SECURITY_NETWORK=y
 CONFIG_XFS_QUOTA=y
 # CONFIG_JFFS2_SUMMARY is not set
@@ -1091,7 +1082,6 @@ CONFIG_DEV_APPLETALK=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_DVB_CX24123=m
 CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_IPW2200_DEBUG is not set
 CONFIG_YENTA_TOSHIBA=y
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
@@ -1119,7 +1109,6 @@ CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_SLAB=y
 # CONFIG_FORCED_INLINING is not set
 CONFIG_USB_ET61X251=m
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XATTR=y
@@ -1138,7 +1127,6 @@ CONFIG_NFS_V4=y
 CONFIG_MMC_SDHCI=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_RELAY is not set
-# CONFIG_BCM43XX_DMA_MODE is not set
 CONFIG_RTC_LIB=m
 CONFIG_GIGASET_BASE=m
 CONFIG_IEEE80211_SOFTMAC=m
@@ -1169,22 +1157,16 @@ CONFIG_LEDS_CLASS=m
 # CONFIG_USB_GADGET_AT91 is not set
 CONFIG_RTC_CLASS=m
 CONFIG_RTC_DRV_PCF8563=m
-CONFIG_BCM43XX_DMA=y
 CONFIG_GIGASET_M105=m
 CONFIG_GIGASET_M101=m
 CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_BCM43XX=m
 CONFIG_TOIM3232_DONGLE=m
 CONFIG_DVB_ZL10353=m
-CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
 CONFIG_IP_DCCP_CCID2=m
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_GIGASET_DEBUG is not set
-CONFIG_IPW2200_MONITOR=y
-# CONFIG_BCM43XX_PIO_MODE is not set
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_RTC_DRV_RS5C372=m
-CONFIG_BCM43XX_PIO=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_CFG80211=m
 CONFIG_MAC80211=m
@@ -1202,7 +1184,6 @@ CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_MUTEXES is not set
-CONFIG_BCM43XX_DEBUG=y
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_VXPOCKET=m
 CONFIG_USB_SERIAL_ARK3116=m
@@ -1212,7 +1193,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_DMA_ENGINE=y
 CONFIG_RTC_DRV_ISL1208=m
-# CONFIG_ZD1211RW_DEBUG is not set
 # CONFIG_UFS_DEBUG is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_INET_XFRM_MODE_TUNNEL=m
@@ -1250,11 +1230,9 @@ CONFIG_ACPI_DOCK=m
 CONFIG_USB_APPLEDISPLAY=m
 CONFIG_SMSC_PHY=m
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_IPW2200_RADIOTAP is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 # CONFIG_DEBUG_RT_MUTEXES is not set
 CONFIG_RTC_DRV_DS1742=m
-CONFIG_ZD1211RW=m
 CONFIG_USB_QUICKCAM_MESSENGER=m
 CONFIG_OCFS2_DEBUG_MASKLOG=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -1276,7 +1254,9 @@ CONFIG_SND_DARLA24=m
 CONFIG_TULIP_NAPI=y
 CONFIG_TULIP_NAPI_HW_MITIGATION=y
 CONFIG_ULI526X=m
+CONFIG_DGRS=m
 CONFIG_VIA_RHINE_NAPI=y
+CONFIG_SC92031=m
 CONFIG_NETDEV_1000=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -1311,10 +1291,38 @@ CONFIG_PROTEON=m
 CONFIG_ABYSS=m
 CONFIG_SMCTR=m
 
+#
+# Wireless LAN
+#
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_RADIOTAP is not set
+# CONFIG_IPW2200_PROMISCUOUS is not set
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBERTAS_USB=m
+CONFIG_AIRO=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+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_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+
 CONFIG_HW_RANDOM=y
 CONFIG_SND_MIA=m
 CONFIG_MCS_FIR=m
-# CONFIG_IPW2200_PROMISCUOUS is not set
 CONFIG_DVB_LNBP21=m
 CONFIG_STACKTRACE_SUPPORT=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
@@ -1330,7 +1338,6 @@ CONFIG_FIXED_PHY=m
 CONFIG_SND_MONA=m
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
-CONFIG_IPW2200_QOS=y
 CONFIG_RTC_DRV_DS1307=m
 # CONFIG_LCD_CLASS_DEVICE is not set
 # CONFIG_FB_BACKLIGHT is not set

debian/changelog

@@ -11,8 +11,8 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
     MLX4_INFINIBAND, SPI_AT25, MFD_SM501, DVB_USB_M920X, DVB_USB_GL861,
     DVB_USB_AU6610, DVB_USB_OPERA1, SENSORS_AD7418, SENSORS_ADM1029,
     SENSORS_F75375S, SENSORS_CORETEMP, SENSORS_MAX6650, SENSORS_APPLESMC,
-    I2C_SIMTEC, I2C_TINY_USB and disable SCSI_ESP_CORE, SPI_SPIDEV in
-    topconfig.
+    I2C_SIMTEC, I2C_TINY_USB, DGRS, SC92031, LIBERTAS_USB and disable
+    SCSI_ESP_CORE, SPI_SPIDEV in topconfig.
   * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
     Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM.
     Disable OSS_OBSOLETE.
@@ -31,7 +31,7 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
   [ dann frazier ]
   * Add Xen licensing info to the copyright file. (closes: #368912)
 
- -- maximilian attems <maks@debian.org>  Fri, 25 May 2007 10:34:57 +0200
+ -- maximilian attems <maks@debian.org>  Sat, 26 May 2007 09:44:37 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low