[Linux-mips-commits]CVS: linux/arch/mips64/configs defconfig-ip22,1.5,1.6 defconfig-ip27,1.5,1.6 defconfig-ip32,1.3,1.4 defconfig-sb1250-swarm,1.1,1.2

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

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

Modified Files:
	defconfig-ip22 defconfig-ip27 defconfig-ip32 
	defconfig-sb1250-swarm 
Log Message:
Synced mips64 stuff to OSS tree.

Index: defconfig-ip22
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-ip22,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defconfig-ip22	2001/11/20 18:00:58	1.5
+++ defconfig-ip22	2001/11/26 17:17:26	1.6
@@ -22,6 +22,7 @@
 CONFIG_BOARD_SCACHE=y
 CONFIG_PC_KEYB=y
 CONFIG_BOOT_ELF32=y
+CONFIG_NONCOHERENT_IO=y
 CONFIG_SGI=y
 CONFIG_L1_CACHE_SHIFT=5
 # CONFIG_ISA is not set

Index: defconfig-ip27
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-ip27,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defconfig-ip27	2001/11/20 18:04:22	1.5
+++ defconfig-ip27	2001/11/26 17:17:26	1.6
@@ -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

Index: defconfig-ip32
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-ip32,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defconfig-ip32	2001/11/20 18:04:22	1.3
+++ defconfig-ip32	2001/11/26 17:17:26	1.4
@@ -21,6 +21,7 @@
 CONFIG_PC_KEYB=y
 CONFIG_PCI=y
 CONFIG_MAPPED_PCI_IO=y
+CONFIG_NONCOHERENT_IO=y
 CONFIG_ARC_MEMORY=y
 CONFIG_L1_CACHE_SHIFT=5
 # CONFIG_ISA is not set

Index: defconfig-sb1250-swarm
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/configs/defconfig-sb1250-swarm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- defconfig-sb1250-swarm	2001/11/20 18:19:28	1.1
+++ defconfig-sb1250-swarm	2001/11/26 17:17:26	1.2
@@ -16,7 +16,6 @@
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_BOOT_ELF64=y
-CONFIG_COHERENT_IO=y
 CONFIG_SWAP_IO_SPACE=y
 CONFIG_CFE=y
 CONFIG_SIBYTE_SB1250=y
@@ -252,6 +251,7 @@
 # CONFIG_SERIAL_TX3912 is not set
 # CONFIG_SERIAL_TX3912_CONSOLE is not set
 # CONFIG_AU1000_UART is not set
+# CONFIG_TXX927_SERIAL is not set
 CONFIG_SIBYTE_SB1250_DUART=y
 CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
 CONFIG_SB1250_DUART_OUTPUT_BUF_SIZE=1024