diff options
| author | Colin Cross <ccross@android.com> | 2011-06-14 11:36:39 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:39 -0800 |
| commit | 8b5682907f27c1bad73ee5ec9584a338ea9cd0be (patch) | |
| tree | 277b1c137d29b729f21fd12413700d2ee63f8095 /kernel | |
| parent | d3d577b41a494c8d40f39683c83471f447493515 (diff) | |
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |