[kernel] r14730 - in dists/trunk/linux-2.6/debian: . config config/alpha config/armel config/hppa config/ia64 config/kernelarch-x86 config/mips config/mipsel config/powerpc config/sparc
Bastian Blank
waldi at alioth.debian.org
Fri Dec 4 17:21:02 UTC 2009
Author: waldi
Date: Fri Dec 4 17:21:00 2009
New Revision: 14730
Log:
* debian/changelog: Update.
* debian/config: Centralize USB mass storage support options.
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/armel/config.iop32x
dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
dists/trunk/linux-2.6/debian/config/armel/config.orion5x
dists/trunk/linux-2.6/debian/config/armel/config.versatile
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/hppa/config
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/config/sparc/config
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/changelog Fri Dec 4 17:21:00 2009 (r14730)
@@ -18,6 +18,7 @@
* Make linux-patch package depend against python.
* Use python-support instead of python-central.
* Always enable software watchdog support.
+ * Always enable complete USB mass storage support.
[ Ben Hutchings ]
* Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Fri Dec 4 17:21:00 2009 (r14730)
@@ -1008,15 +1008,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-# CONFIG_USB_STORAGE_USBAT is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x Fri Dec 4 17:21:00 2009 (r14730)
@@ -621,7 +621,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx Fri Dec 4 17:21:00 2009 (r14730)
@@ -695,15 +695,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Fri Dec 4 17:21:00 2009 (r14730)
@@ -605,15 +605,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x Fri Dec 4 17:21:00 2009 (r14730)
@@ -581,15 +581,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile Fri Dec 4 17:21:00 2009 (r14730)
@@ -357,7 +357,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/config Fri Dec 4 17:21:00 2009 (r14730)
@@ -2323,6 +2323,15 @@
##
## file: drivers/usb/storage/Kconfig
##
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
CONFIG_USB_STORAGE_ALAUDA=y
CONFIG_USB_STORAGE_ONETOUCH=y
CONFIG_USB_STORAGE_KARMA=y
Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/hppa/config Fri Dec 4 17:21:00 2009 (r14730)
@@ -549,19 +549,6 @@
# CONFIG_USB_SISUSBVGA is not set
##
-## file: drivers/usb/storage/Kconfig
-##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Fri Dec 4 17:21:00 2009 (r14730)
@@ -681,20 +681,6 @@
CONFIG_USB_SERIAL_EDGEPORT_TI=m
##
-## file: drivers/usb/storage/Kconfig
-##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_LIBUSUAL=y
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Fri Dec 4 17:21:00 2009 (r14730)
@@ -1170,19 +1170,6 @@
CONFIG_USB_SISUSBVGA=m
##
-## file: drivers/usb/storage/Kconfig
-##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-
-##
## file: drivers/video/Kconfig
##
CONFIG_VIDEO_OUTPUT_CONTROL=m
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Fri Dec 4 17:21:00 2009 (r14730)
@@ -1233,19 +1233,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_LIBUSUAL is not set
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Fri Dec 4 17:21:00 2009 (r14730)
@@ -1498,19 +1498,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_LIBUSUAL is not set
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32 Fri Dec 4 17:21:00 2009 (r14730)
@@ -545,7 +545,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a Fri Dec 4 17:21:00 2009 (r14730)
@@ -700,18 +700,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-# CONFIG_USB_LIBUSUAL is not set
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Fri Dec 4 17:21:00 2009 (r14730)
@@ -730,18 +730,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_LIBUSUAL is not set
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt Fri Dec 4 17:21:00 2009 (r14730)
@@ -703,18 +703,6 @@
##
## file: drivers/usb/storage/Kconfig
##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_ISD200 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-CONFIG_USB_STORAGE_ALAUDA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
-# CONFIG_USB_LIBUSUAL is not set
##
## file: drivers/video/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Dec 4 17:21:00 2009 (r14730)
@@ -778,19 +778,6 @@
CONFIG_USB_SISUSBVGA=m
##
-## file: drivers/usb/storage/Kconfig
-##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config Fri Dec 4 17:13:59 2009 (r14729)
+++ dists/trunk/linux-2.6/debian/config/sparc/config Fri Dec 4 17:21:00 2009 (r14730)
@@ -466,19 +466,6 @@
CONFIG_USB_SISUSBVGA=m
##
-## file: drivers/usb/storage/Kconfig
-##
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-# CONFIG_USB_STORAGE_USBAT is not set
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-
-##
## file: drivers/video/Kconfig
##
CONFIG_FB=y
More information about the Kernel-svn-changes
mailing list