diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2012-11-20 05:06:00 -0500 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2013-01-31 10:51:59 -0500 |
| commit | 1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2 (patch) | |
| tree | ac02d4cdc545251cb9197456c7fbd41a64a4dbe0 /drivers/clocksource/Makefile | |
| parent | 1dac0dd71cdda2bd7395dd47a6b617ed296d4901 (diff) | |
arm64: move from arm_generic to arm_arch_timer
The arch_timer driver supports a superset of the functionality of the
arm_generic driver, and is not tied to a particular arch.
This patch moves arm64 to use the arch_timer driver, gaining additional
functionality in doing so, and removes the (now unused) arm_generic
driver. Timer-related hooks specific to arm64 are moved into
arch/arm64/kernel/time.c.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'drivers/clocksource/Makefile')
| -rw-r--r-- | drivers/clocksource/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 32f858c8eecc..e69511c4c66e 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile | |||
| @@ -17,5 +17,4 @@ obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o | |||
| 17 | obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o | 17 | obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o |
| 18 | obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o | 18 | obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o |
| 19 | 19 | ||
| 20 | obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o | ||
| 21 | obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o | 20 | obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o |