Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6] / kernel / time / Makefile

diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index a941743c3ff8e9371d105d5c9bffcd04ba8d45bf..93bccba1f265e3b49df7d5bc54810ec5e3e39b2d 100644 (file)
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@ -1,5 +1,8 @@
-obj-y += ntp.o clocksource.o jiffies.o
+obj-y += ntp.o clocksource.o jiffies.o timer_list.o
 
 obj-$(CONFIG_GENERIC_CLOCKEVENTS)              += clockevents.o
 obj-$(CONFIG_GENERIC_CLOCKEVENTS)              += tick-common.o
 obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)    += tick-broadcast.o
+obj-$(CONFIG_TICK_ONESHOT)                     += tick-oneshot.o
+obj-$(CONFIG_TICK_ONESHOT)                     += tick-sched.o
+obj-$(CONFIG_TIMER_STATS)                      += timer_stats.o