[kernel] r13428 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Fri Apr 17 01:03:04 2009
New Revision: 13428

Log:
topconfig enable ported AT76C50X_USB

instead of older staging crap.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Apr 17 00:41:38 2009	(r13427)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Apr 17 01:03:04 2009	(r13428)
@@ -8,6 +8,7 @@
   * [sparc] Enable BLK_DEV_CRYPTOLOOP. (closes: #521829)
   * Enable PATA_JMICRON instead of legacy BLK_DEV_JMICRON.
     (closes: #431500, #458493)
+  * topconfig set new NILFS2, AT76C50X_USB.
 
   [ Ben Hutchings ]
   * Remove firmware from driver/staging (closes: #521553)

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Apr 17 00:41:38 2009	(r13427)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Apr 17 01:03:04 2009	(r13428)
@@ -1439,6 +1439,7 @@
 CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_AIRO=m
+CONFIG_AT76C50X_USB=m
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
@@ -1845,7 +1846,7 @@
 ##
 ## file: drivers/staging/at76_usb/Kconfig
 ##
-CONFIG_USB_ATMEL=m
+# CONFIG_USB_ATMEL is not set
 
 ##
 ## file: drivers/staging/comedi/Kconfig