summaryrefslogtreecommitdiff
path: root/target/arm
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-26 02:29:11 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-26 02:29:11 +0100
commit8d5f70a15b65616574c9c26dcbdd956906b2063b (patch)
tree1d5066f1ea91e43377c30784d0daf77cd42ca683 /target/arm
parent9ba5458abb6f6ed70a0fdaeace26d97f3913e389 (diff)
parent610ad706c4c74a65a14b0e29dda22959855a2a57 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/arm')
-rw-r--r--target/arm/kernel/raspberry-pi3
1 files changed, 1 insertions, 2 deletions
diff --git a/target/arm/kernel/raspberry-pi b/target/arm/kernel/raspberry-pi
index debb98417..2a1450ca3 100644
--- a/target/arm/kernel/raspberry-pi
+++ b/target/arm/kernel/raspberry-pi
@@ -2,7 +2,7 @@ CONFIG_ARM=y
CONFIG_FIQ=y
CONFIG_ARM_PATCH_PHYS_VIRT=y
CONFIG_KUSER_HELPERS=y
-CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
CONFIG_ARCH_BCM2708=y
@@ -10,7 +10,6 @@ CONFIG_MACH_BCM2708=y
CONFIG_BCM2708_GPIO=y
CONFIG_BCM2708_VCMEM=y
CONFIG_BCM2708_DMAER=y
-CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_VFP=y
CONFIG_DTC=y