git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
arch
/
mips
/
configs
/
sb1250-swarm_defconfig
diff --git
a/arch/mips/configs/sb1250-swarm_defconfig
b/arch/mips/configs/sb1250-swarm_defconfig
index
a9acaa2
..
7f38c0b
100644
(file)
--- a/
arch/mips/configs/sb1250-swarm_defconfig
+++ b/
arch/mips/configs/sb1250-swarm_defconfig
@@
-133,7
+133,6
@@
CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_MT_SMP is not set
# CONFIG_MIPS_MT_SMTC is not set
CONFIG_SB1_PASS_2_WORKAROUNDS=y
-CONFIG_CPU_HAS_LLSC=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y