From 80bfc43ef3921e2ee978d438858e8e457ff62f2b Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 8 Dec 2008 14:53:28 +0900
Subject: [PATCH] --- yaml --- r: 120102 b: refs/heads/master c:
 a47925ffd1b1b22ee004de36e2c8b811910616ba h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/sh/configs/rsk7201_defconfig | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3633ed9cd6fa..45734d5bc027 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff15b9050677b9d63959cbca4c9abe36a05c72c9
+refs/heads/master: a47925ffd1b1b22ee004de36e2c8b811910616ba
diff --git a/trunk/arch/sh/configs/rsk7201_defconfig b/trunk/arch/sh/configs/rsk7201_defconfig
index 4a75584721fc..014c18cbf46a 100644
--- a/trunk/arch/sh/configs/rsk7201_defconfig
+++ b/trunk/arch/sh/configs/rsk7201_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28-rc6
-# Thu Nov 27 12:14:18 2008
+# Mon Dec  8 14:48:02 2008
 #
 CONFIG_SUPERH=y
 CONFIG_SUPERH32=y
@@ -16,6 +16,8 @@ CONFIG_GENERIC_IRQ_PROBE=y
 # CONFIG_GENERIC_GPIO is not set
 # CONFIG_GENERIC_TIME is not set
 # CONFIG_GENERIC_CLOCKEVENTS is not set
+# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
+# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -207,7 +209,9 @@ CONFIG_CPU_HAS_FPU=y
 #
 # Board support
 #
+CONFIG_SH_RSK=y
 CONFIG_SH_RSK7201=y
+# CONFIG_SH_RSK7203 is not set
 
 #
 # Timer and clock configuration
@@ -277,6 +281,14 @@ CONFIG_BINFMT_ZFLAT=y
 CONFIG_BINFMT_SHARED_FLAT=y
 # CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options (EXPERIMENTAL)
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
 # CONFIG_NET is not set
 
 #