Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[firefly-linux-kernel-4.4.55.git] / kernel / time / Makefile

diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index 61a3907d16fb5caa0ef0391b3e52b70a08a6844e..93bccba1f265e3b49df7d5bc54810ec5e3e39b2d 100644 (file)
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@ -1 +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