summaryrefslogtreecommitdiffstats
path: root/arch/mips/configs/jaguar-atx_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 09:00:55 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 09:00:55 -0800
commitd936cfc72032fb4af03d1edd99596d18ea1f081c (patch)
tree6d524c57fbff717ba82c6f4925659f6ec901d45d /arch/mips/configs/jaguar-atx_defconfig
parent4f47707b056bd2e3627ef390557ee93d312daba5 (diff)
parentadfc76419bff33542d4fd53dc7f24818f846f194 (diff)
downloadop-kernel-dev-d936cfc72032fb4af03d1edd99596d18ea1f081c.zip
op-kernel-dev-d936cfc72032fb4af03d1edd99596d18ea1f081c.tar.gz
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/configs/jaguar-atx_defconfig')
-rw-r--r--arch/mips/configs/jaguar-atx_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 6238e0d..14fb468 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -124,7 +124,6 @@ CONFIG_CPU_HAS_PREFETCH=y
# CONFIG_64BIT_PHYS_ADDR is not set
# CONFIG_CPU_ADVANCED 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
OpenPOWER on IntegriCloud