From 36ff5075c9a6ad3b7d2c207ad1fa8be781622927 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
Date: Thu, 28 Jun 2012 09:45:14 -0700
Subject: [PATCH] --- yaml --- r: 313023 b: refs/heads/master c:
 e0246e8ecad10b9437381b89756292ac031d4cfa h: refs/heads/master i:   313021:
 2e44af53b25189634977752700f3a775a9a89492   313019:
 50d0a4adf7de0ac92228287bf37a42183eb55a1a   313015:
 2bc88d930f46efc0fe93e0b8e86eee4ea5c2f9f1   313007:
 893503d5138f4243258df54604a423132c5e83da   312991:
 5d579fcbb3146bee3f18fcd3182743d2d55272da   312959:
 a05eb3609ea1a294a72b00f0d67d06d2c33306f0 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-omap2/Kconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c3cf665e69c3..69bafcd4afba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fb37842e47dd7f96725b86cb89a03dcecc72a46
+refs/heads/master: e0246e8ecad10b9437381b89756292ac031d4cfa
diff --git a/trunk/arch/arm/mach-omap2/Kconfig b/trunk/arch/arm/mach-omap2/Kconfig
index cf84588cd110..2f4ace6f91d1 100644
--- a/trunk/arch/arm/mach-omap2/Kconfig
+++ b/trunk/arch/arm/mach-omap2/Kconfig
@@ -35,7 +35,7 @@ config ARCH_OMAP3
 	select CPU_V7
 	select USB_ARCH_HAS_EHCI if USB_SUPPORT
 	select ARCH_HAS_OPP
-	select PM if CPU_IDLE
+	select PM_RUNTIME if CPU_IDLE
 	select PM_OPP if PM
 	select ARM_CPU_SUSPEND if PM
 	select MULTI_IRQ_HANDLER
@@ -53,7 +53,7 @@ config ARCH_OMAP4
 	select PL310_ERRATA_727915
 	select ARM_ERRATA_720789
 	select ARCH_HAS_OPP
-	select PM if CPU_IDLE
+	select PM_RUNTIME if CPU_IDLE
 	select PM_OPP if PM
 	select USB_ARCH_HAS_EHCI if USB_SUPPORT
 	select ARM_CPU_SUSPEND if PM