diff options
author | Axel Lin <axel.lin@gmail.com> | 2013-12-18 04:26:52 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-12-29 12:46:51 +0000 |
commit | 3077202eb95ad5bb6abd1e6dcb28d852c1fa48b3 (patch) | |
tree | 7d5e7f4b50123b256bab6a577b4c19fbc33284be /arch/arm/Kconfig | |
parent | dce5c9e35bc4085bd33eccdb8c9ec5a643507a14 (diff) | |
download | op-kernel-dev-3077202eb95ad5bb6abd1e6dcb28d852c1fa48b3.zip op-kernel-dev-3077202eb95ad5bb6abd1e6dcb28d852c1fa48b3.tar.gz |
ARM: 7929/1: Remove duplicate SCHED_HRTICK config option
There are two SCHED_HRTICK config entries in Kconfig.
This looks like a merge mistake. Fix it.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 929915e..8c064a3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1653,9 +1653,6 @@ config HZ config SCHED_HRTICK def_bool HIGH_RES_TIMERS -config SCHED_HRTICK - def_bool HIGH_RES_TIMERS - config THUMB2_KERNEL bool "Compile the kernel in Thumb-2 mode" if !CPU_THUMBONLY depends on (CPU_V7 || CPU_V7M) && !CPU_V6 && !CPU_V6K |