---

yaml --- r: 313023 b: refs/heads/master c: e0246e8 h: refs/heads/master i: 313021: 2e44af5 313019: 50d0a4a 313015: 2bc88d9 313007: 893503d 312991: 5d579fc 312959: a05eb36 v: v3
git-mirror · Jun 29, 2012 · 36ff507 · 36ff507
1 parent d429cc2
commit 36ff507
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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