diff options
-rw-r--r-- | drivers/acpi/Kconfig | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 5e8f15ffe99d..1117358256ba 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -44,9 +44,9 @@ config ACPI | |||
44 | if ACPI | 44 | if ACPI |
45 | 45 | ||
46 | config ACPI_SLEEP | 46 | config ACPI_SLEEP |
47 | bool "Sleep States (EXPERIMENTAL)" | 47 | bool "Sleep States" |
48 | depends on X86 && (!SMP || SUSPEND_SMP) | 48 | depends on X86 && (!SMP || SUSPEND_SMP) |
49 | depends on EXPERIMENTAL && PM | 49 | depends on PM |
50 | default y | 50 | default y |
51 | ---help--- | 51 | ---help--- |
52 | This option adds support for ACPI suspend states. | 52 | This option adds support for ACPI suspend states. |
@@ -108,7 +108,6 @@ config ACPI_BUTTON | |||
108 | config ACPI_VIDEO | 108 | config ACPI_VIDEO |
109 | tristate "Video" | 109 | tristate "Video" |
110 | depends on X86 | 110 | depends on X86 |
111 | depends on EXPERIMENTAL | ||
112 | default m | 111 | default m |
113 | help | 112 | help |
114 | This driver implement the ACPI Extensions For Display Adapters | 113 | This driver implement the ACPI Extensions For Display Adapters |
@@ -120,7 +119,7 @@ config ACPI_VIDEO | |||
120 | for your integrated video device. | 119 | for your integrated video device. |
121 | 120 | ||
122 | config ACPI_HOTKEY | 121 | config ACPI_HOTKEY |
123 | tristate "Generic Hotkey" | 122 | tristate "Generic Hotkey (EXPERIMENTAL)" |
124 | depends on EXPERIMENTAL | 123 | depends on EXPERIMENTAL |
125 | depends on X86 | 124 | depends on X86 |
126 | default n | 125 | default n |
@@ -296,7 +295,6 @@ config ACPI_SYSTEM | |||
296 | config X86_PM_TIMER | 295 | config X86_PM_TIMER |
297 | bool "Power Management Timer Support" | 296 | bool "Power Management Timer Support" |
298 | depends on X86 | 297 | depends on X86 |
299 | depends on EXPERIMENTAL | ||
300 | depends on !X86_64 | 298 | depends on !X86_64 |
301 | default n | 299 | default n |
302 | help | 300 | help |