diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-14 22:28:32 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-14 22:28:32 +0100 |
commit | 4b2f8838479eb2abe042e094f7d2cced6d5ea772 (patch) | |
tree | 5ef3236b354a494c8d71a572896283e44989c696 /arch/arm/mach-asm9260/Kconfig | |
parent | c848791f0336914a3081ea3fe029cf177d81de81 (diff) | |
parent | 9fd85eb502a78bd812db58bd1f668b2a06ee30a5 (diff) | |
download | linux-4b2f8838479eb2abe042e094f7d2cced6d5ea772.tar.bz2 |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/mach-asm9260/Kconfig')
-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. |