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 'upstream'
[pandora-kernel.git]
/
arch
/
mips
/
configs
/
ip32_defconfig
diff --git
a/arch/mips/configs/ip32_defconfig
b/arch/mips/configs/ip32_defconfig
index
cba2a49
..
967e7ac
100644
(file)
--- a/
arch/mips/configs/ip32_defconfig
+++ b/
arch/mips/configs/ip32_defconfig
@@
-121,7
+121,6
@@
CONFIG_R5000_CPU_SCACHE=y
CONFIG_RM7000_CPU_SCACHE=y
# CONFIG_MIPS_MT is not set
CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_LLDSCD=y
CONFIG_CPU_HAS_SYNC=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y