Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / plat-omap / Kconfig

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 49a4c75..6e6735f 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/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"