summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRakesh Iyer <riyer@nvidia.com>2010-07-19 16:35:34 -0700
committerYu-Huan Hsu <yhsu@nvidia.com>2010-07-20 18:48:45 -0700
commit9be36709fcf089c48299dd4b9d3a5fd25782f6f2 (patch)
treeb7fe996839ef193f70d792e15a27b282a1531b0e
parent502f9aec4b761e0d9bbf5fd5ef9c5c281d1757b7 (diff)
[ARM] harmony: Disable Power Management Wake Locks
Disabling the CONFIG_WAKELOCK config variable from defconfig file. Bug 700568 Change-Id: I042937ea692d08f6ce6754295fb9c628536acdb2 Reviewed-on: http://git-master/r/4113 Reviewed-by: Rakesh Iyer <riyer@nvidia.com> Tested-by: Rakesh Iyer <riyer@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_harmony_gnu_linux_defconfig11
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
index 8f4bcc5522ee..aef6a876d6a1 100644
--- a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Fri Jun 25 13:34:33 2010
+# Mon Jul 19 16:30:58 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -393,15 +393,10 @@ CONFIG_PM_SLEEP_SMP=y
CONFIG_PM_SLEEP=y
CONFIG_SUSPEND=y
CONFIG_SUSPEND_FREEZER=y
-CONFIG_HAS_WAKELOCK=y
-CONFIG_HAS_EARLYSUSPEND=y
-CONFIG_WAKELOCK=y
-CONFIG_WAKELOCK_STAT=y
-CONFIG_USER_WAKELOCK=y
-CONFIG_EARLYSUSPEND=y
+# CONFIG_WAKELOCK is not set
# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
# CONFIG_CONSOLE_EARLYSUSPEND is not set
-CONFIG_FB_EARLYSUSPEND=y
+# CONFIG_FB_EARLYSUSPEND is not set
# CONFIG_APM_EMULATION is not set
# CONFIG_PM_RUNTIME is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y