[Linux-mips-commits]CVS: linux/arch/mips config.in,1.101,1.102

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

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

Modified Files:
	config.in 
Log Message:
Correct CONFIG_PM conflict in config.in and move misplaced files.


Index: config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/config.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- config.in	30 May 2002 20:42:08 -0000	1.101
+++ config.in	13 Jun 2002 12:57:33 -0000	1.102
@@ -693,9 +693,9 @@
 define_bool CONFIG_BINFMT_AOUT n
 define_bool CONFIG_BINFMT_ELF y
 tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
+dep_bool 'Power Management support (EXPERIMENTAL)' CONFIG_PM $CONFIG_EXPERIMENTAL
 
 if [ "$CONFIG_CASIO_E15" = "y" ]; then
-   bool 'Power Management support (experimental)' CONFIG_PM
    if [ "$CONFIG_PM" = "y" ]; then
       bool ' Support suspend/wakeup (VR41xx hibernate)' CONFIG_PM_SUSPEND_WAKEUP
       bool ' Support non-volatile suspend (VR41xx suspend)' CONFIG_PM_POWERED_SUSPEND
@@ -707,7 +707,6 @@
    fi
 fi
 dep_bool 'Support CPU clock change (EXPERIMENTAL)' CONFIG_CPU_FREQ $CONFIG_EXPERIMENTAL
-dep_bool 'Power Management support (EXPERIMENTAL)' CONFIG_PM $CONFIG_EXPERIMENTAL $CONFIG_MIPS_AU1000
 endmenu
 
 source drivers/mtd/Config.in