[Linux-mips-commits]CVS: linux/arch/mips64 config.in,1.7,1.8 defconfig,1.10,1.11

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

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

Modified Files:
	config.in defconfig 
Log Message:
Synced mips64 stuff to OSS tree.

Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config.in	2001/11/20 18:00:58	1.7
+++ config.in	2001/11/26 17:17:26	1.8
@@ -45,7 +45,6 @@
 unset CONFIG_BOARD_SCACHE
 unset CONFIG_BOOT_ELF32
 unset CONFIG_BOOT_ELF64
-unset CONFIG_COHERENT_IO
 unset CONFIG_ISA
 unset CONFIG_MAPPED_PCI_IO
 unset CONFIG_PCI
@@ -57,6 +56,7 @@
    define_bool CONFIG_BOARD_SCACHE y
    define_bool CONFIG_PC_KEYB y
    define_bool CONFIG_BOOT_ELF32 y
+   define_bool CONFIG_NONCOHERENT_IO y
    define_bool CONFIG_SGI y
    define_int CONFIG_L1_CACHE_SHIFT 5
 fi
@@ -64,7 +64,6 @@
 if [ "$CONFIG_SGI_IP27" = "y" ]; then
    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
@@ -78,13 +77,13 @@
    define_bool CONFIG_PCI y
    #define_bool CONFIG_BOARD_SCACHE y
    define_bool CONFIG_MAPPED_PCI_IO y
+   define_bool CONFIG_NONCOHERENT_IO y
    define_bool CONFIG_ARC_MEMORY y
    define_int CONFIG_L1_CACHE_SHIFT 5
 fi
 
 if [ "$CONFIG_SIBYTE_SWARM" = "y" ]; then
    define_bool CONFIG_BOOT_ELF64 y
-   define_bool CONFIG_COHERENT_IO y
    define_bool CONFIG_SWAP_IO_SPACE y
    define_bool CONFIG_CFE y
    define_bool CONFIG_SIBYTE_SB1250 y

Index: defconfig
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/defconfig,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- defconfig	2001/11/20 18:04:22	1.10
+++ defconfig	2001/11/26 17:17:26	1.11
@@ -23,7 +23,6 @@
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_BOOT_ELF64=y
 CONFIG_ARC64=y
-CONFIG_COHERENT_IO=y
 CONFIG_MAPPED_PCI_IO=y
 CONFIG_PCI=y
 CONFIG_QL_ISP_A64=y