From 34320ebecfe5d8b3fcb6aafd925d86d154fb58ca Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Sun, 22 Nov 2009 13:57:34 +0000
Subject: [PATCH] [armel/kirkwood] Turn on USB_SUSPEND

svn path=/dists/trunk/linux-2.6/; revision=14662
---
 debian/changelog                    | 8 ++++++++
 debian/config/armel/config.kirkwood | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 959b23407..d0f3c82eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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 ]
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 780af4ea1..e067ba480 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -498,6 +498,7 @@ CONFIG_USB_PRINTER=m
 ## file: drivers/usb/core/Kconfig
 ##
 CONFIG_USB_DEVICEFS=y
+CONFIG_USB_SUSPEND=y
 
 ##
 ## file: drivers/usb/host/Kconfig
@@ -586,7 +587,8 @@ CONFIG_UBIFS_FS=y
 ##
 ## file: kernel/power/Kconfig
 ##
-# CONFIG_PM is not set
+CONFIG_PM=y
+# CONFIG_SUSPEND is not set
 
 ##
 ## file: kernel/time/Kconfig