[Linux-mips-commits]CVS: linux/arch/mips config.in,1.19,1.20

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips
In directory usw-pr-cvs1:/tmp/cvs-serv5550

Modified Files:
	config.in 
Log Message:
Small changes to sync with Ralph.

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** config.in	2001/08/28 23:12:15	1.19
--- config.in	2001/09/04 15:52:48	1.20
***************
*** 234,239 ****
     define_bool CONFIG_PCI y
     define_bool CONFIG_PC_KEYB y
-    define_bool CONFIG_NEW_PCI y
     define_bool CONFIG_PCI_AUTO y
  fi
  if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
--- 234,239 ----
     define_bool CONFIG_PCI y
     define_bool CONFIG_PC_KEYB y
     define_bool CONFIG_PCI_AUTO y
+    define_bool CONFIG_NEW_PCI y
  fi
  if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
***************
*** 285,289 ****
  	"R3000 CONFIG_CPU_R3000	\
  	 R6000 CONFIG_CPU_R6000	\
! 	 VR41xx CONFIG_CPU_VR41XX \
  	 R4300 CONFIG_CPU_R4300	\
  	 R4x00 CONFIG_CPU_R4X00	\
--- 285,289 ----
  	"R3000 CONFIG_CPU_R3000	\
  	 R6000 CONFIG_CPU_R6000	\
! 	 R41xx CONFIG_CPU_VR41XX \
  	 R4300 CONFIG_CPU_R4300	\
  	 R4x00 CONFIG_CPU_R4X00	\
***************
*** 305,310 ****
     bool '  Writeback Buffer available' CONFIG_CPU_HAS_WB
  else
!    if [ "$CONFIG_CPU_R3000" = "y" -o \
!         "$CONFIG_CPU_VR41XX" = "y" ]; then
        if [ "$CONFIG_DECSTATION" = "y" ]; then
  	 define_bool CONFIG_CPU_HAS_LLSC n
--- 305,309 ----
     bool '  Writeback Buffer available' CONFIG_CPU_HAS_WB
  else
!    if [ "$CONFIG_CPU_R3000" = "y" -o "$CONFIG_CPU_VR41XX" = "y" ]; then
        if [ "$CONFIG_DECSTATION" = "y" ]; then
  	 define_bool CONFIG_CPU_HAS_LLSC n