* debian/changelog: Update.
* debian/config/kernelarch-x86/config, debian/config/powerpc/config, debian/config/sparc/config: Set USB to module. * debian/config/kernelarch-x86/config-arch-32, debian/config/kernelarch-x86/config-arch-64: Remove USB. svn path=/dists/trunk/linux-2.6/; revision=14732
This commit is contained in:
parent
e84c8cf44b
commit
5d70571c39
|
@ -19,6 +19,7 @@ linux-2.6 (2.6.32-1) UNRELEASED; urgency=low
|
|||
* Use python-support instead of python-central.
|
||||
* Always enable software watchdog support.
|
||||
* Always enable complete USB mass storage support.
|
||||
* [amd64, powerpc, sparc] Build USB support as module.
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* Re-enable accidentally omitted drivers, thanks to Uwe Kleine-König
|
||||
|
|
|
@ -1114,6 +1114,7 @@ CONFIG_THERMAL_HWMON=y
|
|||
##
|
||||
## file: drivers/usb/Kconfig
|
||||
##
|
||||
CONFIG_USB=m
|
||||
CONFIG_USB_USS720=m
|
||||
|
||||
##
|
||||
|
|
|
@ -392,11 +392,6 @@ CONFIG_PCMCIA_NINJA_SCSI=m
|
|||
##
|
||||
CONFIG_SERIAL_8250_EXAR_ST16C554=m
|
||||
|
||||
##
|
||||
## file: drivers/usb/Kconfig
|
||||
##
|
||||
CONFIG_USB=m
|
||||
|
||||
##
|
||||
## file: drivers/video/Kconfig
|
||||
##
|
||||
|
|
|
@ -106,11 +106,6 @@ CONFIG_MAC_EMUMOUSEBTN=y
|
|||
##
|
||||
CONFIG_SCSI_INIA100=m
|
||||
|
||||
##
|
||||
## file: drivers/usb/Kconfig
|
||||
##
|
||||
CONFIG_USB=y
|
||||
|
||||
##
|
||||
## file: drivers/video/Kconfig
|
||||
##
|
||||
|
|
|
@ -719,7 +719,7 @@ CONFIG_PHONE_IXJ_PCMCIA=m
|
|||
##
|
||||
## file: drivers/usb/Kconfig
|
||||
##
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB=m
|
||||
|
||||
##
|
||||
## file: drivers/usb/atm/Kconfig
|
||||
|
|
|
@ -418,7 +418,7 @@ CONFIG_SERIAL_JSM=m
|
|||
##
|
||||
## file: drivers/usb/Kconfig
|
||||
##
|
||||
CONFIG_USB=y
|
||||
CONFIG_USB=m
|
||||
# CONFIG_USB_USS720 is not set
|
||||
|
||||
##
|
||||
|
|
Loading…
Reference in New Issue