[Linuxconsole-commit]CVS: ruby/linux/arch/i386 config.in,1.37,1.38

[johann d. <jd...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/i386
In directory usw-pr-cvs1:/tmp/cvs-serv3588/arch/i386

Modified Files:
	config.in 
Log Message:
Fixed a bug that would make APM options appear when CONFIG_PM and CONFIG_APM are set to "n".


Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/config.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- config.in	16 Apr 2002 17:41:47 -0000	1.37
+++ config.in	17 Apr 2002 19:28:17 -0000	1.38
@@ -274,7 +274,7 @@
 bool 'Power Management support' CONFIG_PM
 
 dep_tristate '  Advanced Power Management BIOS support' CONFIG_APM $CONFIG_PM
-if [ "$CONFIG_APM" != "n" ]; then
+if [ "$CONFIG_PM" != "n" -a "$CONFIG_APM" != "n" ]; then
    bool '    Ignore USER SUSPEND' CONFIG_APM_IGNORE_USER_SUSPEND
    bool '    Enable PM at boot time' CONFIG_APM_DO_ENABLE
    bool '    Make CPU Idle calls when idle' CONFIG_APM_CPU_IDLE