[Linux-mips-commits]CVS: linux/arch/mips/configs defconfig-casio-e15,1.5,1.6

[Leblanc f. <fle...@us...>]

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

Modified Files:
	defconfig-casio-e15 
Log Message:
Correct CONFIG_PM conflict in config.in and move misplaced files.


Index: defconfig-casio-e15
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/configs/defconfig-casio-e15,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- defconfig-casio-e15	13 Jun 2002 07:45:19 -0000	1.5
+++ defconfig-casio-e15	13 Jun 2002 12:57:33 -0000	1.6
@@ -10,22 +10,40 @@
 CONFIG_EXPERIMENTAL=y
 
 #
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
 # Machine selection
 #
 # CONFIG_ACER_PICA_61 is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1500 is not set
 # CONFIG_ALGOR_P4032 is not set
 # CONFIG_BAGET_MIPS is not set
 # CONFIG_MIPS_COBALT is not set
 # CONFIG_DECSTATION is not set
-# CONFIG_DDB5074 is not set
-# CONFIG_NEC_EAGLE is not set
-# CONFIG_NEC_KORVA is not set
-# CONFIG_MIPS_EV96100 is not set
 # CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_ITE8172 is not set
 # CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MAGNUM_4000 is not set
 # CONFIG_MIPS_MALTA is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_NEC_EAGLE is not set
+# CONFIG_NEC_KORVA is not set
+# CONFIG_OLIVETTI_M700 is not set
 # CONFIG_NINO is not set
-# CONFIG_SIBYTE_SB1250 is not set
 # CONFIG_PS2 is not set
 # CONFIG_CASIO_BE300 is not set
 CONFIG_CASIO_E15=y
@@ -36,26 +54,14 @@
 # CONFIG_IBM_WORKPAD is not set
 # CONFIG_CASIO_E55 is not set
 # CONFIG_VICTOR_MPC303 is not set
-# CONFIG_MIPS_MAGNUM_4000 is not set
-# 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_SIBYTE_SB1250 is not set
 # CONFIG_SNI_RM200_PCI is not set
-# CONFIG_MIPS_ITE8172 is not set
-# CONFIG_MIPS_IVR is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1100 is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_HP_LASERJET is not set
+# CONFIG_MIPS_LXPB20K is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_MCA is not set
-# CONFIG_SBUS is not set
 CONFIG_CPU_VR41XX=y
 CONFIG_VR4111=y
 CONFIG_NEW_IRQ=y
@@ -70,19 +76,13 @@
 CONFIG_VR41XX_LED=y
 CONFIG_GPIO_LCD=y
 CONFIG_VR41XX_EXTEND_HIBERNATE=y
-CONFIG_EISA=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
+# CONFIG_MIPS_AU1000 is not set
 
 #
 # CPU selection
 #
 # CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_LX45XXX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_R6000 is not set
 CONFIG_CPU_VR41XX=y
@@ -112,8 +112,20 @@
 # CONFIG_CPU_R5900_CONTEXT is not set
 # CONFIG_VR4131_CACHE_FIX is not set
 # CONFIG_VR4122_CLKSPEEDREG_FIX is not set
+CONFIG_NET=y
+# CONFIG_PCI is not set
+CONFIG_EISA=y
+# CONFIG_TC is not set
+# CONFIG_MCA is not set
+# CONFIG_SBUS is not set
+# CONFIG_HOTPLUG is not set
+# CONFIG_PCMCIA is not set
+# CONFIG_HOTPLUG_PCI is not set
+CONFIG_SYSVIPC=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
 CONFIG_KCORE_ELF=y
-CONFIG_ELF_KERNEL=y
+# CONFIG_KCORE_AOUT is not set
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
@@ -124,19 +136,6 @@
 CONFIG_PROC_GIUINFO=y
 # CONFIG_MOUNT_PROC is not set
 # CONFIG_CPU_FREQ is not set
-CONFIG_NET=y
-# CONFIG_HOTPLUG is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-
-#
-# Plug and Play configuration
-#
-# CONFIG_PNP is not set
-# CONFIG_ISAPNP is not set
 
 #
 # Memory Technology Devices (MTD)
@@ -149,6 +148,12 @@
 # CONFIG_PARPORT is not set
 
 #
+# Plug and Play configuration
+#
+# CONFIG_PNP is not set
+# CONFIG_ISAPNP is not set
+
+#
 # Block devices
 #
 # CONFIG_BLK_DEV_FD is not set
@@ -275,15 +280,6 @@
 # CONFIG_SCSI is not set
 
 #
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -615,15 +611,6 @@
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_E1355 is not set
 # CONFIG_FB_MQ200 is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_E1356 is not set
 # CONFIG_FB_IT8181 is not set
 # CONFIG_FB_SIMPLE is not set
 CONFIG_FB_HPCSFB=y