[kernel] r14662 - in dists/trunk/linux-2.6/debian: . config/armel

[Martin Michlmayr]

Author: tbm
Date: Sun Nov 22 13:57:34 2009
New Revision: 14662

Log:
[armel/kirkwood] Turn on USB_SUSPEND

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Nov 21 20:42:09 2009	(r14661)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Nov 22 13:57:34 2009	(r14662)
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.32~rc8-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Martin Michlmayr ]
+  * [armel/kirkwood] Turn on USB_SUSPEND (on the request of a SheevaPlug
+    user).
+
+ -- Martin Michlmayr <tbm at cyrius.com>  Sun, 22 Nov 2009 13:56:12 +0000
+
 linux-2.6 (2.6.32~rc8-1~experimental.1) unstable; urgency=low
 
   [ Ben Hutchings ]

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Sat Nov 21 20:42:09 2009	(r14661)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Sun Nov 22 13:57:34 2009	(r14662)
@@ -498,6 +498,7 @@
 ## file: drivers/usb/core/Kconfig
 ##
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_SUSPEND=y
 
 ##
 ## file: drivers/usb/host/Kconfig
@@ -586,7 +587,8 @@
 ##
 ## file: kernel/power/Kconfig
 ##
-# CONFIG_PM is not set
+CONFIG_PM=y
+# CONFIG_SUSPEND is not set
 
 ##
 ## file: kernel/time/Kconfig