[kernel] r14749 - in dists/trunk/linux-2.6/debian: . config config/armel config/kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Sun Dec  6 20:17:22 2009
New Revision: 14749

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

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Dec  6 20:15:51 2009	(r14748)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Dec  6 20:17:22 2009	(r14749)
@@ -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 at debian.org>  Sun, 06 Dec 2009 20:42:14 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Sun Dec  6 20:15:51 2009	(r14748)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Sun Dec  6 20:17:22 2009	(r14749)
@@ -581,11 +581,6 @@
 CONFIG_USB_PRINTER=m
 
 ##
-## file: drivers/usb/core/Kconfig
-##
-CONFIG_USB_SUSPEND=y
-
-##
 ## file: drivers/usb/host/Kconfig
 ##
 CONFIG_USB_EHCI_HCD=m

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Dec  6 20:15:51 2009	(r14748)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Dec  6 20:17:22 2009	(r14749)
@@ -2223,7 +2223,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Dec  6 20:15:51 2009	(r14748)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Dec  6 20:17:22 2009	(r14749)
@@ -1132,11 +1132,6 @@
 CONFIG_USB_PRINTER=m
 
 ##
-## file: drivers/usb/core/Kconfig
-##
-CONFIG_USB_SUSPEND=y
-
-##
 ## file: drivers/usb/host/Kconfig
 ##
 CONFIG_USB_EHCI_HCD=m