* debian/changelog: Update.

* debian/config/armel/config.kirkwood,
  debian/config/kernelarch-x86/config: Remove duplicated options.
* debian/config/config: Set USB_SUSPEND.

svn path=/dists/trunk/linux-2.6/; revision=14749
This commit is contained in:
Bastian Blank 2009-12-06 20:17:22 +00:00
parent 2df8d76c66
commit 18c538f8c8
4 changed files with 2 additions and 11 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
linux-2.6 (2.6.32-2) UNRELEASED; urgency=low
* Allow memory hot-add and -remove if possible.
* Enable USB suspend.
-- Bastian Blank <waldi@debian.org> Sun, 06 Dec 2009 20:42:14 +0100

View File

@ -580,11 +580,6 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
##
## file: drivers/usb/core/Kconfig
##
CONFIG_USB_SUSPEND=y
##
## file: drivers/usb/host/Kconfig
##

View File

@ -2223,7 +2223,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not set
# CONFIG_USB_DYNAMIC_MINORS is not set
# CONFIG_USB_SUSPEND is not set
CONFIG_USB_SUSPEND=y
##
## file: drivers/usb/gadget/Kconfig

View File

@ -1131,11 +1131,6 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
##
## file: drivers/usb/core/Kconfig
##
CONFIG_USB_SUSPEND=y
##
## file: drivers/usb/host/Kconfig
##