diff options
| author | Colin Cross <ccross@android.com> | 2011-06-14 11:36:39 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 11:37:53 -0700 |
| commit | abbb445f65bbb139202fde5a66f9a249977058c9 (patch) | |
| tree | 07f1a792c9c1fba2c291b64887f9cb08b661e811 | |
| parent | 4700c54b66189fe2acaa49df63e56a1615d99d32 (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>
| -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 |