diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 14:35:58 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-20 14:35:58 (GMT) |
commit | 1b1c7409b75a8b62906b78b84c8469002072b738 (patch) | |
tree | 91ceea4d8fae61b29e9a716c5e6ad56c3b5f588b /arch/arm/Kconfig | |
parent | 573f8c8d13377ec03c2d23269f8eea50c11a7432 (diff) | |
parent | b28748fb5d21d5d64c9ce31579ffbbd41f317042 (diff) | |
download | linux-1b1c7409b75a8b62906b78b84c8469002072b738.tar.xz |
Merge branch 'misc' into for-linus
Conflicts:
arch/arm/include/asm/memory.h
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 67874b8..a192a5c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1655,6 +1655,9 @@ config HZ default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE default 100 +config SCHED_HRTICK + def_bool HIGH_RES_TIMERS + config THUMB2_KERNEL bool "Compile the kernel in Thumb-2 mode" depends on CPU_V7 && !CPU_V6 && !CPU_V6K |