CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/08/05 16:25:57

Modified files:
        arch/mips      : Kconfig 

Log message:
        Undo recent damage to CONFIG_CPU_ADVANCED for now.

diff -urN linux/arch/mips/Kconfig linux/arch/mips/Kconfig
--- linux/arch/mips/Kconfig     2005/08/05 15:04:35     1.163
+++ linux/arch/mips/Kconfig     2005/08/05 15:25:57     1.164
@@ -1282,7 +1282,7 @@
 
 config CPU_HAS_LLSC
        bool "ll/sc Instructions available" if CPU_ADVANCED
-       default y if !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX
+       default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX
        help
          MIPS R4000 series and later provide the Load Linked (ll)
          and Store Conditional (sc) instructions. More information is
@@ -1302,7 +1302,7 @@
 
 config CPU_HAS_WB
        bool "Writeback Buffer available" if CPU_ADVANCED
-       default y if CPU_R3000 && MACH_DECSTATION
+       default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION
        help
          Say N here for slightly better performance.  You must say Y here for
          machines which require flushing of write buffers in software.  Saying