summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2010-08-06 19:46:49 +0530
committerBryan Wu <bryan.wu@canonical.com>2010-08-26 21:24:34 +0800
commit0b1d9d0a5841439e98e2aa1319e4569f88aa887b (patch)
treeb1c1d75b394fdd9ad121730f6961f61f28d3e113 /kernel
parent00f04d96033e25e0bc6bc7c316adef635d83785a (diff)
OMAP4: config: Kconfig and defconfig chnages to keep ES1 working
This patch is an attempt to keep ES1 working and some PM options configurable. This is intended only for internal use and will be eventually removed, when we no longer need ES1 to be supported and when PM features are well tested and expected to work. Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 95ed42951e0a..d384c6173da2 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -6,7 +6,7 @@ config TICK_ONESHOT
config NO_HZ
bool "Tickless System (Dynamic Ticks)"
- depends on GENERIC_TIME && GENERIC_CLOCKEVENTS
+ depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && !OMAP4_ES1
select TICK_ONESHOT
help
This option enables a tickless system: timer interrupts will
@@ -15,7 +15,7 @@ config NO_HZ
config HIGH_RES_TIMERS
bool "High Resolution Timer Support"
- depends on GENERIC_TIME && GENERIC_CLOCKEVENTS
+ depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && !OMAP4_ES1
select TICK_ONESHOT
help
This option enables high resolution timer support. If your