[Linuxconsole-commit] CVS: ruby/linux/arch/mips64 config.in,1.15,1.16

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

Update of /cvsroot/linuxconsole/ruby/linux/arch/mips64
In directory usw-pr-cvs1:/tmp/cvs-serv25708/linux/arch/mips64

Modified Files:
	config.in 
Log Message:
Synced to 2.4.10

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips64/config.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- config.in	2001/07/29 18:24:12	1.15
+++ config.in	2001/10/06 16:11:12	1.16
@@ -41,6 +41,7 @@
 unset CONFIG_BOOT_ELF64
 unset CONFIG_COHERENT_IO
 unset CONFIG_ISA
+unset CONFIG_MAPPED_PCI_IO
 unset CONFIG_PCI
 
 if [ "$CONFIG_SGI_IP22" = "y" ]; then
@@ -56,6 +57,7 @@
    define_bool CONFIG_BOOT_ELF64 y
    define_bool CONFIG_ARC64 y
    define_bool CONFIG_COHERENT_IO y
+   define_bool CONFIG_MAPPED_PCI_IO y
    define_bool CONFIG_PCI y
    define_bool CONFIG_QL_ISP_A64 y
    define_int CONFIG_L1_CACHE_SHIFT 7
@@ -177,7 +179,7 @@
 fi
 endmenu
 
-source drivers/message/i2o/Config.in
+#source drivers/message/i2o/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
    mainmenu_option next_comment
@@ -255,7 +257,7 @@
 fi
 bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
-if [ "$CONFIG_SMP" != "n" ]; then
+if [ "$CONFIG_SMP" != "y" ]; then
    bool 'Run uncached' CONFIG_MIPS_UNCACHED
 fi
 endmenu