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 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
mips
/
configs
/
ocelot_c_defconfig
diff --git
a/arch/mips/configs/ocelot_c_defconfig
b/arch/mips/configs/ocelot_c_defconfig
index
570fc4d
..
e8d6bb3
100644
(file)
--- a/
arch/mips/configs/ocelot_c_defconfig
+++ b/
arch/mips/configs/ocelot_c_defconfig
@@
-118,7
+118,6
@@
CONFIG_RM7000_CPU_SCACHE=y
CONFIG_CPU_HAS_PREFETCH=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