From abbb445f65bbb139202fde5a66f9a249977058c9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 14 Jun 2011 11:36:39 -0700 Subject: [PATCH 300/696] 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 --- kernel/time/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/time/Makefile b/kernel/time/Makefile index e2fd74b..cae2ad7 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 -- 1.7.1