[Linux-mips-commits] CVS: linux/arch/mips config.in,1.14,1.15

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

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

Modified Files:
	config.in 
Log Message:
PCI autoconfiguration code.

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** config.in	2001/08/18 18:21:00	1.14
--- config.in	2001/08/20 16:09:51	1.15
***************
*** 19,23 ****
     bool 'Support for Algorithmics P4032 (EXPERIMENTAL)' CONFIG_ALGOR_P4032
     bool 'Support for BAGET MIPS series (EXPERIMENTAL)' CONFIG_BAGET_MIPS
!    bool 'Support for Cobalt Server (EXPERIMENTAL)' CONFIG_COBALT_MICRO_SERVER	
     bool 'Support for DECstations (EXPERIMENTAL)' CONFIG_DECSTATION
     bool 'Support for NEC DDB Vrc-5074 (EXPERIMENTAL)' CONFIG_DDB5074
--- 19,23 ----
     bool 'Support for Algorithmics P4032 (EXPERIMENTAL)' CONFIG_ALGOR_P4032
     bool 'Support for BAGET MIPS series (EXPERIMENTAL)' CONFIG_BAGET_MIPS
!    bool 'Support for Cobalt Server (EXPERIMENTAL)' CONFIG_COBALT_MICRO_SERVER
     bool 'Support for DECstations (EXPERIMENTAL)' CONFIG_DECSTATION
     bool 'Support for NEC DDB Vrc-5074 (EXPERIMENTAL)' CONFIG_DDB5074
***************
*** 99,105 ****
     define_bool CONFIG_PCI y
     define_bool CONFIG_MIPS_GT96100 y
-    define_bool CONFIG_NEW_PCI y
-    define_bool CONFIG_PCI_AUTO y	
     define_bool CONFIG_SWAP_IO_SPACE y
  fi
  if [ "$CONFIG_MIPS_EV64120" = "y" ]; then
--- 99,105 ----
     define_bool CONFIG_PCI y
     define_bool CONFIG_MIPS_GT96100 y
     define_bool CONFIG_SWAP_IO_SPACE y
+    define_bool CONFIG_NEW_PCI y
+    define_bool CONFIG_PCI_AUTO y
  fi
  if [ "$CONFIG_MIPS_EV64120" = "y" ]; then
***************
*** 211,214 ****
--- 211,216 ----
     define_bool CONFIG_IT8712 y
     define_bool CONFIG_PC_KEYB y
+    define_bool CONFIG_NEW_PCI y
+    define_bool CONFIG_PCI_AUTO y
  fi
  if [ "$CONFIG_MIPS_IVR" = "y" ]; then
***************
*** 223,226 ****
--- 225,238 ----
     define_bool CONFIG_NEW_PCI y
  fi
+ if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
+    define_bool COBALT_MICRO_SERVER y
+    define_bool CONFIG_NO_SWAPPER y
+    define_bool CONFIG_COBALT_27 y
+    define_bool CONFIG_NO_KEYBOARD y
+    define_bool CONFIG_NO_VIDEO_CONSOLE y
+    define_bool CONFIG_COBALT_LCD y
+    define_bool CONFIG_PCI y
+    define_bool CONFIG_OLD_TIME_C y
+ fi
  if [ "$CONFIG_NINO" = "y" ]; then
     define_bool CONFIG_PC_KEYB y
***************
*** 240,254 ****
  if [ "$CONFIG_I8259" != "y" ]; then
     define_bool CONFIG_I8259 n
- fi
- 
- if [ "$CONFIG_COBALT_MICRO_SERVER" = "y" ]; then
-    define_bool COBALT_MICRO_SERVER y
-    define_bool CONFIG_NO_SWAPPER y
-    define_bool CONFIG_COBALT_27 y
-    define_bool CONFIG_NO_KEYBOARD y
-    define_bool CONFIG_NO_VIDEO_CONSOLE y
-    define_bool CONFIG_COBALT_LCD y
-    define_bool CONFIG_PCI y
-    define_bool CONFIG_OLD_TIME_C y
  fi
  endmenu
--- 252,255 ----