From: Colin Cross <ccross@android.com>
Date: Tue, 14 Jun 2011 18:36:39 +0000 (-0700)
Subject: HACK: time: Disable alarmtimer
X-Git-Tag: firefly_0821_release~7613^2~605
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=abbb445f65bbb139202fde5a66f9a249977058c9;p=firefly-linux-kernel-4.4.55.git

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>
---

diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index e2fd74b8e8c2..cae2ad7491b0 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