Commit fa5e5a42 authored by Len Brown's avatar Len Brown

ACPI: merge andy-2.6 into lenb-2.6

parent 47637d5d
......@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment