Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / clocksource / Makefile

diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 9196331..dd91381 100644 (file)
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -23,8 +23,8 @@ obj-$(CONFIG_FTTMR010_TIMER)  += timer-fttmr010.o
 obj-$(CONFIG_ROCKCHIP_TIMER)      += rockchip_timer.o
 obj-$(CONFIG_CLKSRC_NOMADIK_MTU)       += nomadik-mtu.o
 obj-$(CONFIG_CLKSRC_DBX500_PRCMU)      += clksrc-dbx500-prcmu.o
-obj-$(CONFIG_ARMADA_370_XP_TIMER)      += time-armada-370-xp.o
-obj-$(CONFIG_ORION_TIMER)      += time-orion.o
+obj-$(CONFIG_ARMADA_370_XP_TIMER)      += timer-armada-370-xp.o
+obj-$(CONFIG_ORION_TIMER)      += timer-orion.o
 obj-$(CONFIG_BCM2835_TIMER)    += bcm2835_timer.o
 obj-$(CONFIG_CLPS711X_TIMER)   += clps711x-timer.o
 obj-$(CONFIG_ATLAS7_TIMER)     += timer-atlas7.o
@@ -36,25 +36,25 @@ obj-$(CONFIG_SUN4I_TIMER)   += sun4i_timer.o
 obj-$(CONFIG_SUN5I_HSTIMER)    += timer-sun5i.o
 obj-$(CONFIG_MESON6_TIMER)     += meson6_timer.o
 obj-$(CONFIG_TEGRA_TIMER)      += tegra20_timer.o
-obj-$(CONFIG_VT8500_TIMER)     += vt8500_timer.o
-obj-$(CONFIG_NSPIRE_TIMER)     += zevio-timer.o
+obj-$(CONFIG_VT8500_TIMER)     += timer-vt8500.o
+obj-$(CONFIG_NSPIRE_TIMER)     += timer-zevio.o
 obj-$(CONFIG_BCM_KONA_TIMER)   += bcm_kona_timer.o
-obj-$(CONFIG_CADENCE_TTC_TIMER)        += cadence_ttc_timer.o
-obj-$(CONFIG_CLKSRC_EFM32)     += time-efm32.o
+obj-$(CONFIG_CADENCE_TTC_TIMER)        += timer-cadence-ttc.o
+obj-$(CONFIG_CLKSRC_EFM32)     += timer-efm32.o
 obj-$(CONFIG_CLKSRC_STM32)     += timer-stm32.o
 obj-$(CONFIG_CLKSRC_EXYNOS_MCT)        += exynos_mct.o
-obj-$(CONFIG_CLKSRC_LPC32XX)   += time-lpc32xx.o
+obj-$(CONFIG_CLKSRC_LPC32XX)   += timer-lpc32xx.o
 obj-$(CONFIG_CLKSRC_MPS2)      += mps2-timer.o
 obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)       += samsung_pwm_timer.o
-obj-$(CONFIG_FSL_FTM_TIMER)    += fsl_ftm_timer.o
-obj-$(CONFIG_VF_PIT_TIMER)     += vf_pit_timer.o
-obj-$(CONFIG_CLKSRC_QCOM)      += qcom-timer.o
+obj-$(CONFIG_FSL_FTM_TIMER)    += timer-fsl-ftm.o
+obj-$(CONFIG_VF_PIT_TIMER)     += timer-vf-pit.o
+obj-$(CONFIG_CLKSRC_QCOM)      += timer-qcom.o
 obj-$(CONFIG_MTK_TIMER)                += timer-mediatek.o
-obj-$(CONFIG_CLKSRC_PISTACHIO) += time-pistachio.o
+obj-$(CONFIG_CLKSRC_PISTACHIO) += timer-pistachio.o
 obj-$(CONFIG_CLKSRC_TI_32K)    += timer-ti-32k.o
 obj-$(CONFIG_CLKSRC_NPS)       += timer-nps.o
 obj-$(CONFIG_OXNAS_RPS_TIMER)  += timer-oxnas-rps.o
-obj-$(CONFIG_OWL_TIMER)                += owl-timer.o
+obj-$(CONFIG_OWL_TIMER)                += timer-owl.o
 obj-$(CONFIG_SPRD_TIMER)       += timer-sprd.o
 obj-$(CONFIG_NPCM7XX_TIMER)    += timer-npcm7xx.o
 
@@ -66,7 +66,7 @@ obj-$(CONFIG_ARM_TIMER_SP804)         += timer-sp804.o
 obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST)  += dummy_timer.o
 obj-$(CONFIG_KEYSTONE_TIMER)           += timer-keystone.o
 obj-$(CONFIG_INTEGRATOR_AP_TIMER)      += timer-integrator-ap.o
-obj-$(CONFIG_CLKSRC_VERSATILE)         += versatile.o
+obj-$(CONFIG_CLKSRC_VERSATILE)         += timer-versatile.o
 obj-$(CONFIG_CLKSRC_MIPS_GIC)          += mips-gic-timer.o
 obj-$(CONFIG_CLKSRC_TANGO_XTAL)                += tango_xtal.o
 obj-$(CONFIG_CLKSRC_IMX_GPT)           += timer-imx-gpt.o