diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-09-26 15:05:54 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-09-26 15:05:54 -0400 |
| commit | 17deb9c2db01c7813611291d251d8c7dbdfd3c9d (patch) | |
| tree | 6e023c0be7c64de84dd51a671eb09c5c82b56615 /drivers/clocksource/Makefile | |
| parent | f4e6e1ea19737077d958f2bc6c196eb579d97544 (diff) | |
| parent | 389e067032fbb96e439abafae848dd447e4cafb4 (diff) | |
Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion
Update to tip/timers/core and resolve minor conflict.
Conflicts:
drivers/clocksource/samsung_pwm_timer.c
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource/Makefile')
| -rw-r--r-- | drivers/clocksource/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 8b00c5cebfa4..704d6d342adc 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile | |||
| @@ -18,6 +18,7 @@ obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o | |||
| 18 | obj-$(CONFIG_ORION_TIMER) += time-orion.o | 18 | obj-$(CONFIG_ORION_TIMER) += time-orion.o |
| 19 | obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o | 19 | obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o |
| 20 | obj-$(CONFIG_ARCH_MARCO) += timer-marco.o | 20 | obj-$(CONFIG_ARCH_MARCO) += timer-marco.o |
| 21 | obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o | ||
| 21 | obj-$(CONFIG_ARCH_MXS) += mxs_timer.o | 22 | obj-$(CONFIG_ARCH_MXS) += mxs_timer.o |
| 22 | obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o | 23 | obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o |
| 23 | obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o | 24 | obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o |