projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dce5c9e
)
ARM: 7929/1: Remove duplicate SCHED_HRTICK config option
author
Axel Lin
<axel.lin@gmail.com>
Wed, 18 Dec 2013 03:26:52 +0000
(
04:26
+0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Sun, 29 Dec 2013 12:46:51 +0000
(12:46 +0000)
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>
arch/arm/Kconfig
patch
|
blob
|
history
diff --git
a/arch/arm/Kconfig
b/arch/arm/Kconfig
index 929915e177ae2a653f385a3ac73065f8dfd5767c..8c064a3e43dbc46c274c9cbc545e9e2e4eb2d855 100644
(file)
--- 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