summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/Makefile
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2012-11-20 10:06:00 +0000
committerMark Rutland <mark.rutland@arm.com>2013-01-31 15:51:59 +0000
commit1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2 (patch)
treeac02d4cdc545251cb9197456c7fbd41a64a4dbe0 /drivers/clocksource/Makefile
parent1dac0dd71cdda2bd7395dd47a6b617ed296d4901 (diff)
downloadop-kernel-dev-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.zip
op-kernel-dev-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.tar.gz
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/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 32f858c..e69511c 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -17,5 +17,4 @@ obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o
obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o
obj-$(CONFIG_SUNXI_TIMER) += sunxi_timer.o
-obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o
obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o
OpenPOWER on IntegriCloud