[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-atlas,1.5,1.6 defconfig-ddb5476,1.7,1.8 defconfig-ddb5477,1.7,1.8 defconfig-decstation,1.6,1.7 defconfig-ev64120,1.5,1.6 defconfig-ev96100,1.6,1.7 defconfig-ip22,1.6,1.7 defconfig-it8172,1.7,1.8 defconfig-malta,1.5,1.6 defconfig-nino,1.6,1.7 defconfig-ocelot,1.5,1.6 defconfig-pb1000,1.7,1.8

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

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

Modified Files:
	defconfig-atlas defconfig-ddb5476 defconfig-ddb5477 
	defconfig-decstation defconfig-ev64120 defconfig-ev96100 
	defconfig-ip22 defconfig-it8172 defconfig-malta defconfig-nino 
	defconfig-ocelot defconfig-pb1000 
Log Message:
Synced to Ralph's tree for Osprey support.

Index: defconfig-atlas
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-atlas,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defconfig-atlas	2001/09/15 17:06:10	1.5
+++ defconfig-atlas	2001/10/02 18:35:48	1.6
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set

Index: defconfig-ddb5476
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ddb5476,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defconfig-ddb5476	2001/09/15 17:06:10	1.7
+++ defconfig-ddb5476	2001/10/02 18:35:48	1.8
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 CONFIG_DDB5476=y
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set
@@ -229,6 +229,7 @@
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_IDEPCI_SHARE_IRQ is not set
 # CONFIG_BLK_DEV_IDEDMA_PCI is not set
+# CONFIG_BLK_DEV_ADMA is not set
 # CONFIG_BLK_DEV_OFFBOARD is not set
 # CONFIG_IDEDMA_PCI_AUTO is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
@@ -238,8 +239,8 @@
 # CONFIG_AEC62XX_TUNING is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_WDC_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD7409 is not set
-# CONFIG_AMD7409_OVERRIDE is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_AMD74XX_OVERRIDE is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CS5530 is not set
@@ -250,6 +251,8 @@
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_PDC202XX is not set
 # CONFIG_PDC202XX_BURST is not set
+# CONFIG_PDC202XX_FORCE is not set
+# CONFIG_BLK_DEV_SVWKS is not set
 # CONFIG_BLK_DEV_OSB4 is not set
 # CONFIG_BLK_DEV_SIS5513 is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
@@ -544,16 +547,16 @@
 # CONFIG_FB_CLGEN is not set
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_E1355 is not set
 # CONFIG_FB_PVR2 is not set
 # CONFIG_FB_PVR2_DEBUG is not set
+# CONFIG_FB_E1355 is not set
+# CONFIG_FB_E1356 is not set
 # CONFIG_FB_MQ200 is not set
 # CONFIG_FB_MATROX is not set
 # CONFIG_FB_ATY is not set
 # CONFIG_FB_ATY128 is not set
 CONFIG_FB_3DFX=y
 # CONFIG_FB_SIS is not set
-# CONFIG_FB_E1356 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
 CONFIG_FBCON_CFB8=y

Index: defconfig-ddb5477
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ddb5477,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defconfig-ddb5477	2001/09/26 23:15:06	1.7
+++ defconfig-ddb5477	2001/10/02 18:35:48	1.8
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 CONFIG_DDB5477=y
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set

Index: defconfig-decstation
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-decstation,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- defconfig-decstation	2001/09/15 17:06:10	1.6
+++ defconfig-decstation	2001/10/02 18:35:48	1.7
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 CONFIG_DECSTATION=y
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set

Index: defconfig-ev64120
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ev64120,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defconfig-ev64120	2001/09/15 17:06:10	1.5
+++ defconfig-ev64120	2001/10/02 18:35:48	1.6
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -35,6 +34,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set

Index: defconfig-ev96100
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ev96100,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- defconfig-ev96100	2001/09/15 17:06:10	1.6
+++ defconfig-ev96100	2001/10/02 18:35:48	1.7
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 CONFIG_MIPS_EV96100=y
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set

Index: defconfig-ip22
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ip22,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- defconfig-ip22	2001/09/15 17:06:10	1.6
+++ defconfig-ip22	2001/10/02 18:35:48	1.7
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 CONFIG_SGI_IP22=y
 # CONFIG_SNI_RM200_PCI is not set

Index: defconfig-it8172
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-it8172,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defconfig-it8172	2001/09/15 17:06:10	1.7
+++ defconfig-it8172	2001/10/02 18:35:48	1.8
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set
@@ -300,6 +300,7 @@
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_BLK_DEV_IDEDMA_PCI=y
+CONFIG_BLK_DEV_ADMA=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
 CONFIG_IDEDMA_PCI_AUTO=y
 CONFIG_BLK_DEV_IDEDMA=y
@@ -309,8 +310,8 @@
 # CONFIG_AEC62XX_TUNING is not set
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_WDC_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD7409 is not set
-# CONFIG_AMD7409_OVERRIDE is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_AMD74XX_OVERRIDE is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CS5530 is not set
@@ -323,6 +324,8 @@
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_PDC202XX is not set
 # CONFIG_PDC202XX_BURST is not set
+# CONFIG_PDC202XX_FORCE is not set
+# CONFIG_BLK_DEV_SVWKS is not set
 # CONFIG_BLK_DEV_OSB4 is not set
 # CONFIG_BLK_DEV_SIS5513 is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set

Index: defconfig-malta
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-malta,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defconfig-malta	2001/09/15 17:06:10	1.5
+++ defconfig-malta	2001/10/02 18:35:48	1.6
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set

Index: defconfig-nino
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-nino,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- defconfig-nino	2001/09/15 20:19:08	1.6
+++ defconfig-nino	2001/10/02 18:35:48	1.7
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -34,6 +33,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set
@@ -118,7 +118,7 @@
 # CONFIG_BLK_DEV_NBD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=2048
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_INITRD=y
 
 #
 # Multi-device support (RAID and LVM)

Index: defconfig-ocelot
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-ocelot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defconfig-ocelot	2001/09/15 17:06:10	1.5
+++ defconfig-ocelot	2001/10/02 18:35:48	1.6
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 CONFIG_MOMENCO_OCELOT=y
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set

Index: defconfig-pb1000
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-pb1000,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defconfig-pb1000	2001/09/24 18:52:33	1.7
+++ defconfig-pb1000	2001/10/02 18:35:48	1.8
@@ -18,7 +18,6 @@
 # CONFIG_COBALT_MICRO_SERVER is not set
 # CONFIG_DECSTATION is not set
 # CONFIG_DDB5074 is not set
-# CONFIG_NEC_OSPREY is not set
 # CONFIG_NEC_EAGLE is not set
 # CONFIG_NEC_KORVA is not set
 # CONFIG_MIPS_EV96100 is not set
@@ -31,6 +30,7 @@
 # CONFIG_MOMENCO_OCELOT is not set
 # CONFIG_DDB5476 is not set
 # CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SNI_RM200_PCI is not set
@@ -514,8 +514,10 @@
 # Sound
 #
 CONFIG_SOUND=y
+# CONFIG_SOUND_BT878 is not set
 # CONFIG_SOUND_CMPCI is not set
 # CONFIG_SOUND_EMU10K1 is not set
+# CONFIG_MIDI_EMU10K1 is not set
 # CONFIG_SOUND_FUSION is not set
 # CONFIG_SOUND_CS4281 is not set
 # CONFIG_SOUND_ES1370 is not set
@@ -524,6 +526,7 @@
 # CONFIG_SOUND_MAESTRO is not set
 # CONFIG_SOUND_MAESTRO3 is not set
 # CONFIG_SOUND_ICH is not set
+# CONFIG_SOUND_RME96XX is not set
 # CONFIG_SOUND_SONICVIBES is not set
 CONFIG_SOUND_AU1000=y
 # CONFIG_SOUND_TRIDENT is not set