diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-25 14:44:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-25 14:44:45 +0100 |
| commit | e3eff6fe7d8a877d94f5dbb8fea46b4f8ca4ce5a (patch) | |
| tree | 7653eefd5a0e2b7248d1d15238ef315e52c8173b /arch/arm | |
| parent | Merge tag 'stable/for-linus-4.0-rc1-tag' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | clocksource: pxa: Fix section mismatch (diff) | |
| download | linux-e3eff6fe7d8a877d94f5dbb8fea46b4f8ca4ce5a.tar.xz linux-e3eff6fe7d8a877d94f5dbb8fea46b4f8ca4ce5a.zip | |
Merge branch 'clockevents/4.0-rc1' of git://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevents driver fixes from Daniel Lezcano:
- Fix the Kconfig to prevent the asm9260 timer to be compiled with
allyesconfig with sparc/sparc64 (Daniel Lezcano)
- Reorder the mtk driver init sequence in order to prevent a potential race
when the clock is registered before the irq handler is set (Matthias Brugger)
- Fix a section mismatch for the pxa driver (Robert Jarzmik)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-asm9260/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-asm9260/Kconfig b/arch/arm/mach-asm9260/Kconfig index 8423be76080e..52241207a82a 100644 --- a/arch/arm/mach-asm9260/Kconfig +++ b/arch/arm/mach-asm9260/Kconfig @@ -2,5 +2,7 @@ config MACH_ASM9260 bool "Alphascale ASM9260" depends on ARCH_MULTI_V5 select CPU_ARM926T + select ASM9260_TIMER + select GENERIC_CLOCKEVENTS help Support for Alphascale ASM9260 based platform. |