* debian/changelog: Update.
* debian/config: Centralize USB mass storage support options. svn path=/dists/trunk/linux-2.6/; revision=14730
This commit is contained in:
parent
c89227b1d0
commit
b7229958fd
|
@ -18,6 +18,7 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low
|
|||
* 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
|
||||
|
|
|
@ -1008,15 +1008,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 is not set
|
||||
CONFIG_USB_STORAGE_SDDR09=y
|
||||
CONFIG_USB_STORAGE_SDDR55=y
|
||||
CONFIG_USB_STORAGE_JUMPSHOT=y
|
||||
|
||||
##
|
||||
## file: drivers/video/Kconfig
|
||||
|
|
|
@ -621,7 +621,6 @@ CONFIG_USB_SISUSBVGA=m
|
|||
##
|
||||
## file: drivers/usb/storage/Kconfig
|
||||
##
|
||||
CONFIG_USB_STORAGE=m
|
||||
|
||||
##
|
||||
## file: drivers/video/Kconfig
|
||||
|
|
|
@ -695,15 +695,6 @@ CONFIG_USB_SL811_HCD=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_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
|
||||
|
|
|
@ -605,15 +605,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
|
||||
|
|
|
@ -581,15 +581,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
|
||||
|
|
|
@ -357,7 +357,6 @@ CONFIG_USB_UHCI_HCD=m
|
|||
##
|
||||
## file: drivers/usb/storage/Kconfig
|
||||
##
|
||||
CONFIG_USB_STORAGE=m
|
||||
|
||||
##
|
||||
## file: drivers/video/Kconfig
|
||||
|
|
|
@ -2323,6 +2323,15 @@ CONFIG_USB_SERIAL_DEBUG=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_STORAGE_ALAUDA=y
|
||||
CONFIG_USB_STORAGE_ONETOUCH=y
|
||||
CONFIG_USB_STORAGE_KARMA=y
|
||||
|
|
|
@ -548,19 +548,6 @@ CONFIG_USB_OHCI_HCD=m
|
|||
##
|
||||
# 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
|
||||
##
|
||||
|
|
|
@ -680,20 +680,6 @@ CONFIG_USB_SERIAL_WHITEHEAT=m
|
|||
CONFIG_USB_SERIAL_EDGEPORT=m
|
||||
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
|
||||
##
|
||||
|
|
|
@ -1169,19 +1169,6 @@ CONFIG_USB_TEST=m
|
|||
##
|
||||
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
|
||||
##
|
||||
|
|
|
@ -1233,19 +1233,6 @@ CONFIG_USB_MON=y
|
|||
##
|
||||
## 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
|
||||
|
|
|
@ -1498,19 +1498,6 @@ CONFIG_USB_SERIAL_DEBUG=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_STORAGE_ALAUDA=y
|
||||
CONFIG_USB_STORAGE_ONETOUCH=y
|
||||
CONFIG_USB_STORAGE_KARMA=y
|
||||
# CONFIG_USB_LIBUSUAL is not set
|
||||
|
||||
##
|
||||
## file: drivers/video/Kconfig
|
||||
|
|
|
@ -545,7 +545,6 @@ CONFIG_USB_UHCI_HCD=m
|
|||
##
|
||||
## file: drivers/usb/storage/Kconfig
|
||||
##
|
||||
CONFIG_USB_STORAGE=m
|
||||
|
||||
##
|
||||
## file: drivers/video/Kconfig
|
||||
|
|
|
@ -700,18 +700,6 @@ CONFIG_USB_MON=y
|
|||
##
|
||||
## 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
|
||||
|
|
|
@ -730,18 +730,6 @@ CONFIG_USB_MON=y
|
|||
##
|
||||
## 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
|
||||
|
|
|
@ -703,18 +703,6 @@ CONFIG_USB_MON=y
|
|||
##
|
||||
## 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
|
||||
|
|
|
@ -777,19 +777,6 @@ CONFIG_USB_TEST=m
|
|||
##
|
||||
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
|
||||
##
|
||||
|
|
|
@ -465,19 +465,6 @@ CONFIG_USB_CYTHERM=m
|
|||
##
|
||||
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
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue