From 18c538f8c8fba8bddad9f52abb12b4de77997aed Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 6 Dec 2009 20:17:22 +0000 Subject: [PATCH] * 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 --- debian/changelog | 1 + debian/config/armel/config.kirkwood | 5 ----- debian/config/config | 2 +- debian/config/kernelarch-x86/config | 5 ----- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 811f52ce6..7bcc10b74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 06 Dec 2009 20:42:14 +0100 diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 63665a48b..9ec4f59c8 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -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 ## diff --git a/debian/config/config b/debian/config/config index 1f46fded7..fa487c23f 100644 --- a/debian/config/config +++ b/debian/config/config @@ -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 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 23be48dcb..e853fbf8a 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -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 ##