diff -Naur -X dontdiff linux-2.5.21/arch/i386/config.in linux-2.5.21-config-pm/arch/i386/config.in
--- linux-2.5.21/arch/i386/config.in	Sun Jun  9 15:28:47 2002
+++ linux-2.5.21-config-pm/arch/i386/config.in	Sun Jun 16 21:39:58 2002
@@ -225,6 +225,8 @@
    bool '    Use real mode APM BIOS call to power off' CONFIG_APM_REAL_MODE_POWER_OFF
 fi
 
+dep_mbool 'Software Suspend (EXPERIMENTAL)' CONFIG_SOFTWARE_SUSPEND $CONFIG_PM $CONFIG_EXPERIMENTAL
+
 endmenu
 
 mainmenu_option next_comment
@@ -405,10 +407,6 @@
 
 mainmenu_option next_comment
 comment 'Kernel hacking'
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   dep_bool 'Software Suspend' CONFIG_SOFTWARE_SUSPEND $CONFIG_PM
-fi
-
 bool 'Kernel debugging' CONFIG_DEBUG_KERNEL
 if [ "$CONFIG_DEBUG_KERNEL" != "n" ]; then
    bool '  Debug memory allocations' CONFIG_DEBUG_SLAB