From: Axel Lin <axel.lin@gmail.com>
Date: Wed, 18 Dec 2013 03:26:52 +0000 (+0100)
Subject: ARM: 7929/1: Remove duplicate SCHED_HRTICK config option
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3077202eb95ad5bb6abd1e6dcb28d852c1fa48b3;p=linux-beck.git

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>
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 929915e177ae..8c064a3e43db 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