---

yaml --- r: 258759 b: refs/heads/master c: 476e5be h: refs/heads/master i: 258757: 87344e1 258755: 8152e99 258751: 4df0ddd v: v3
git-mirror · Jul 10, 2011 · 3fd539f · 3fd539f
1 parent df09e09
commit 3fd539f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c95b707caf3504b37b11d2662bde77e1618d481
+refs/heads/master: 476e5be710bec3d324d9a28cf1f4fd15bd358a86
diff --git a/trunk/arch/arm/plat-omap/Kconfig b/trunk/arch/arm/plat-omap/Kconfig
@@ -211,9 +211,6 @@ choice
 	depends on ARCH_OMAP
 	default OMAP_PM_NOOP
 
-config OMAP_PM_NONE
-	bool "No PM layer"
-
 config OMAP_PM_NOOP
 	bool "No-op/debug PM layer"
 

diff --git a/trunk/arch/arm/plat-omap/include/plat/omap-pm.h b/trunk/arch/arm/plat-omap/include/plat/omap-pm.h
@@ -40,23 +40,15 @@
  * framework starts.  The "_if_" is to avoid name collisions with the
  * PM idle-loop code.
  */
-#ifdef CONFIG_OMAP_PM_NONE
-#define omap_pm_if_early_init() 0
-#else
 int __init omap_pm_if_early_init(void);
-#endif
 
 /**
  * omap_pm_if_init - OMAP PM init code called after clock fw init
  *
  * The main initialization code.  OPP tables are passed in here.  The
  * "_if_" is to avoid name collisions with the PM idle-loop code.
  */
-#ifdef CONFIG_OMAP_PM_NONE
-#define omap_pm_if_init() 0
-#else
 int __init omap_pm_if_init(void);
-#endif
 
 /**
  * omap_pm_if_exit - OMAP PM exit code