summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/Kconfig
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2012-11-20 11:06:00 +0100
committerMark Rutland <mark.rutland@arm.com>2013-01-31 16:51:59 +0100
commit1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2 (patch)
treeac02d4cdc545251cb9197456c7fbd41a64a4dbe0 /drivers/clocksource/Kconfig
parentarm64: arm_generic: prevent reading stale time (diff)
downloadlinux-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.tar.xz
linux-1aee5d7a8120cbe3eca9180ef9276d75a4f51dd2.zip
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/Kconfig')
-rw-r--r--drivers/clocksource/Kconfig5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index dbb085ac64d4..64798424b6cb 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -54,10 +54,5 @@ config CLKSRC_DBX500_PRCMU_SCHED_CLOCK
help
Use the always on PRCMU Timer as sched_clock
-config CLKSRC_ARM_GENERIC
- def_bool y if ARM64
- help
- This option enables support for the ARM generic timer.
-
config ARM_ARCH_TIMER
bool