diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 17:39:09 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-05 17:39:09 (GMT) |
| commit | ae2fe0c0cad76973314955f68a26229b621bc3a2 (patch) | |
| tree | 5a27157d34421de93609fe94c9f716561b2ce51e /arch/arm/Kconfig | |
| parent | cd754736097fa6ce03b3543ec111f7a13a0dd2f2 (diff) | |
| parent | c7e783d6adc7798307e7063e11f4127117446d5a (diff) | |
| download | linux-fsl-qoriq-ae2fe0c0cad76973314955f68a26229b621bc3a2.tar.xz | |
Merge tag 'ks8695-time-for-arm-soc' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
This cleans up the ks8695 timer driver and converts
it to use generic time and clock events.
* tag 'ks8695-time-for-arm-soc' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ks8695: convert to generic time and clocksource
ARM: ks8695: delete resume hook from timer
ARM: ks8695: use [readl|writel]_relaxed()
ARM: ks8695: merge the timer header into the timer driver
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fcedbb3..b1330d7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -641,8 +641,9 @@ config ARCH_KS8695 bool "Micrel/Kendin KS8695" select CPU_ARM922T select ARCH_REQUIRE_GPIOLIB - select ARCH_USES_GETTIMEOFFSET select NEED_MACH_MEMORY_H + select CLKSRC_MMIO + select GENERIC_CLOCKEVENTS help Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based System-on-Chip devices. |