ACPI: merge andy-2.6 into lenb-2.6

fa5e5a42 · Len Brown · 47637d5d · fa5e5a42
Commit fa5e5a42 authored Aug 12, 2003 by Len Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/acpi/Kconfig drivers/acpi/Kconfig +2 -2

No files found.
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -66,9 +66,9 @@ config ACPI_BOOT
 	default y
 config ACPI_SLEEP
-	bool "Sleep States"
+	bool "Sleep States (EXPERIMENTAL)"
 	depends on X86 && ACPI
-	depends on SOFTWARE_SUSPEND
+	depends on EXPERIMENTAL
 	default y
 	---help---
 	  This option adds support for ACPI suspend states.