diff mbox

ARM: Remove duplicate SCHED_HRTICK config option

Message ID 1387205515.6989.1.camel@phoenix (mailing list archive)
State New, archived
Headers show

Commit Message

Axel Lin Dec. 16, 2013, 2:51 p.m. UTC 
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>
---
 arch/arm/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

Comments

Olof Johansson Dec. 22, 2013, 7:51 p.m. UTC | #1 
On Mon, Dec 16, 2013 at 10:51:55PM +0800, Axel Lin wrote:
> 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>

Acked-by: Olof Johansson <olof@lixom.net>

Please send to Russell's patch tracker.


-Olof
Axel Lin Dec. 26, 2013, 5:08 a.m. UTC | #2 
2013/12/23 Olof Johansson <olof@lixom.net>:
> On Mon, Dec 16, 2013 at 10:51:55PM +0800, Axel Lin wrote:
>> 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>
>
> Acked-by: Olof Johansson <olof@lixom.net>
>
> Please send to Russell's patch tracker.
Already sent to patch tracker.
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7929/1

Thanks,
Axel
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e462c5d..03649aa0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1656,9 +1656,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