Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

1 files changed, 1 insertions, 9 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b50be449d3f5..c3e852e9953e 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1471,7 +1471,7 @@ config SB1_PASS_2_1_WORKAROUNDS
 
 config 64BIT_PHYS_ADDR
         bool "Support for 64-bit physical address space"
-        depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32_R1 || CPU_MIPS64_R1) && 32BIT
+        depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT
 
 config CPU_ADVANCED
         bool "Override CPU Options"
@@ -1492,14 +1492,6 @@ config CPU_HAS_LLSC
           for better performance, N if you don't know.  You must say Y here
           for multiprocessor machines.
 
-config CPU_HAS_LLDSCD
-        bool "lld/scd Instructions available" if CPU_ADVANCED
-        default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX && !CPU_MIPS32_R1
-        help
-          Say Y here if your CPU has the lld and scd instructions, the 64-bit
-          equivalents of ll and sc.  Say Y here for better performance, N if
-          you don't know.  You must say Y here for multiprocessor machines.
-
 config CPU_HAS_WB
         bool "Writeback Buffer available" if CPU_ADVANCED
         default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION