diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-01 12:00:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-01 12:00:25 -0800 |
| commit | 640c0f5c57864cbc1f495509bdc879fab94d4d9d (patch) | |
| tree | ee1e68209cf3a1ad5ff6edfcc684ee3724c5af7b /arch | |
| parent | d7b48fec3520da075a4093d3aa37ce4daff7510b (diff) | |
| parent | e3eff6fe7d8a877d94f5dbb8fea46b4f8ca4ce5a (diff) | |
| download | linux-640c0f5c57864cbc1f495509bdc879fab94d4d9d.tar.gz linux-640c0f5c57864cbc1f495509bdc879fab94d4d9d.tar.bz2 linux-640c0f5c57864cbc1f495509bdc879fab94d4d9d.zip | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"Three clockevents/clocksource driver fixes"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: pxa: Fix section mismatch
clocksource: mtk: Fix race conditions in probe code
clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig
Diffstat (limited to 'arch')
| -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. |