diff options
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 2 | ||||
| -rw-r--r-- | kernel/power/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index 9b7c431d7b8..b107860b808 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -548,7 +548,7 @@ CONFIG_PM_OPP=y CONFIG_PM_CLK=y CONFIG_CPU_PM=y CONFIG_SUSPEND_TIME=y -CONFIG_HAS_AMBIENTMODE=y +# CONFIG_HAS_AMBIENTMODE is not set CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARM_CPU_SUSPEND=y CONFIG_NET=y diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 361341b6069..1c7f33b6e0f 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -291,7 +291,7 @@ config SUSPEND_TIME /sys/kernel/debug/suspend_time config HAS_AMBIENTMODE - def_bool y + def_bool n depends on PM ---help--- Ambient mode should not turn off/on display/back-light/etc. |