Merge branch 'linus' into x86/urgent

[deliverable/linux.git] / kernel / time / Makefile

diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index ee266620b06ca336a9246489ff9d01d1dd7cd91d..b0425991e9acbc5278379171a7c759c7e773b2b0 100644 (file)
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@ -1,4 +1,5 @@
-obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o timecompare.o timeconv.o
+obj-y += timekeeping.o ntp.o clocksource.o jiffies.o timer_list.o timecompare.o
+obj-y += timeconv.o posix-clock.o
 
 obj-$(CONFIG_GENERIC_CLOCKEVENTS_BUILD)                += clockevents.o
 obj-$(CONFIG_GENERIC_CLOCKEVENTS)              += tick-common.o