aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-12-13 01:23:20 +0800
committerAndy Green <andy.green@linaro.org>2012-01-09 10:53:08 +0800
commit681f724e12e9141b3ac8dcd58f0dc8ea27d1c1cd (patch)
treed3d2b8e739aef33a51c31413a16230fd1c4df20f
parentfdd595320789c7525576cf4e431b7083316ce6ab (diff)
downloadimx53-681f724e12e9141b3ac8dcd58f0dc8ea27d1c1cd.tar.gz
HACK: time: Disable alarmtimer
kernel/time/alarmtimer.c conflicts with drivers/rtc/alarm.c, disable it for now. Change-Id: I6cdb3b885828d45836a54971adf16143039b0a0e Signed-off-by: Colin Cross <ccross@android.com>
-rw-r--r--kernel/time/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index e2fd74b8e8c..cae2ad7491b 100644
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@ -1,5 +1,5 @@
obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o timecompare.o
-obj-y += timeconv.o posix-clock.o alarmtimer.o
+obj-y += timeconv.o posix-clock.o #alarmtimer.o
obj-$(CONFIG_GENERIC_CLOCKEVENTS_BUILD) += clockevents.o
obj-$(CONFIG_GENERIC_CLOCKEVENTS) += tick-common.o