From 13362b2ce817f7cc4978c55468e8a736d43f2c84 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Sat, 10 Sep 2011 11:30:28 +0530
Subject: [PATCH] --- yaml --- r: 270163 b: refs/heads/master c:
 1fb9026344ea9ecc7c5860240104109112384a61 h: refs/heads/master i:   270161:
 5b29e18362b53fb03ce2c83a710facca04d40d29   270159:
 310d5ab2a6759643051cb40852001f3061ed8b60 v: v3

---
 [refs]                 | 2 +-
 trunk/arch/arm/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b37d1b288b1..b704dec7b04a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f3eaec87b6b17bfa49cb3b5b8d07fa84be18512
+refs/heads/master: 1fb9026344ea9ecc7c5860240104109112384a61
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 3269576dbfa8..247d0bc1119b 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -29,6 +29,7 @@ config ARM
 	select HAVE_GENERIC_HARDIRQS
 	select HAVE_SPARSE_IRQ
 	select GENERIC_IRQ_SHOW
+	select CPU_PM if (SUSPEND || CPU_IDLE)
 	help
 	  The ARM series is a line of low-power-consumption RISC chip designs
 	  licensed by ARM Ltd and targeted at embedded applications and