[PATCH] swsusp & acpi_sleep: configuration issues

This moves CONFIG_SOFTWARE_SUSPEND where it belongs, and makes
ACPI_SLEEP depend on it to prevent compile problems.

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index cf8b7fb50fad64091fef909852395412f9e8c8b8..073355b7deffd6b604f56f144e4833330e3c7825 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -789,8 +789,6 @@ endmenu
 
 menu "Power management options (ACPI, APM)"
 
-source "drivers/acpi/Kconfig"
-
 config PM
        bool "Power Management support"
        ---help---
@@ -811,6 +809,37 @@ config PM
          will issue the hlt instruction if nothing is to be done, thereby
          sending the processor to sleep and saving power.
 
+config SOFTWARE_SUSPEND
+       bool "Software Suspend (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && PM
+       ---help---
+         Enable the possibilty of suspendig machine. It doesn't need APM.
+         You may suspend your machine by 'swsusp' or 'shutdown -z <time>' 
+         (patch for sysvinit needed). 
+
+         It creates an image which is saved in your active swaps. By the next
+         booting the, pass 'resume=/path/to/your/swap/file' and kernel will 
+         detect the saved image, restore the memory from
+         it and then it continues to run as before you've suspended.
+         If you don't want the previous state to continue use the 'noresume'
+         kernel option. However note that your partitions will be fsck'd and
+         you must re-mkswap your swap partitions/files.
+
+         Right now you may boot without resuming and then later resume but
+         in meantime you cannot use those swap partitions/files which were
+         involved in suspending. Also in this case there is a risk that buffers
+         on disk won't match with saved ones.
+
+         SMP is supported ``as-is''. There's a code for it but doesn't work.
+         There have been problems reported relating SCSI.
+
+         This option is about getting stable. However there is still some
+         absence of features.
+
+         For more information take a look at Documentation/swsusp.txt.
+
+source "drivers/acpi/Kconfig"
+
 config APM
        tristate "Advanced Power Management BIOS support"
        depends on PM
@@ -1516,35 +1545,6 @@ source "arch/i386/oprofile/Kconfig"
 
 menu "Kernel hacking"
 
-config SOFTWARE_SUSPEND
-       bool "Software Suspend (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PM
-       ---help---
-         Enable the possibilty of suspendig machine. It doesn't need APM.
-         You may suspend your machine by 'swsusp' or 'shutdown -z <time>' 
-         (patch for sysvinit needed). 
-
-         It creates an image which is saved in your active swaps. By the next
-         booting the, pass 'resume=/path/to/your/swap/file' and kernel will 
-         detect the saved image, restore the memory from
-         it and then it continues to run as before you've suspended.
-         If you don't want the previous state to continue use the 'noresume'
-         kernel option. However note that your partitions will be fsck'd and
-         you must re-mkswap your swap partitions/files.
-
-         Right now you may boot without resuming and then later resume but
-         in meantime you cannot use those swap partitions/files which were
-         involved in suspending. Also in this case there is a risk that buffers
-         on disk won't match with saved ones.
-
-         SMP is supported ``as-is''. There's a code for it but doesn't work.
-         There have been problems reported relating SCSI.
-
-         This option is about getting stable. However there is still some
-         absence of features.
-
-         For more information take a look at Documentation/swsusp.txt.
-
 config DEBUG_KERNEL
        bool "Kernel debugging"
        help

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 6555049a674b7de99a306292e2fe3d7c5e15671c..ddb11443e51c6510c0cd3a67cf710f5bd925deb8 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -58,8 +58,7 @@ config ACPI_BOOT
 
 config ACPI_SLEEP
        bool "Sleep States"
-       depends on X86 && ACPI && !ACPI_HT_ONLY
-       default SOFTWARE_SUSPEND
+       depends on X86 && ACPI && !ACPI_HT_ONLY && SOFTWARE_SUSPEND
        ---help---
          This option adds support for ACPI suspend states.