diff options
author | Kees Cook <keescook@chromium.org> | 2013-01-16 21:53:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 17:52:42 -0500 |
commit | f756f28b84af5faa4dcb70ef10c6350b6ce081be (patch) | |
tree | 66fb1f8037fc8db98ee350f0b27724bbcd63b13a /drivers/acpi/Kconfig | |
parent | aa8820cc3b6e2ce67b1ec320d02e9ce0f72275ea (diff) |
drivers/acpi: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
CC: Len Brown <lenb@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 38c5078da11d..7ec178e03379 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -176,7 +176,6 @@ config ACPI_FAN | |||
176 | 176 | ||
177 | config ACPI_DOCK | 177 | config ACPI_DOCK |
178 | bool "Dock" | 178 | bool "Dock" |
179 | depends on EXPERIMENTAL | ||
180 | help | 179 | help |
181 | This driver supports ACPI-controlled docking stations and removable | 180 | This driver supports ACPI-controlled docking stations and removable |
182 | drive bays such as the IBM Ultrabay and the Dell Module Bay. | 181 | drive bays such as the IBM Ultrabay and the Dell Module Bay. |
@@ -202,7 +201,7 @@ config ACPI_PROCESSOR | |||
202 | the module will be called processor. | 201 | the module will be called processor. |
203 | config ACPI_IPMI | 202 | config ACPI_IPMI |
204 | tristate "IPMI" | 203 | tristate "IPMI" |
205 | depends on EXPERIMENTAL && IPMI_SI && IPMI_HANDLER | 204 | depends on IPMI_SI && IPMI_HANDLER |
206 | default n | 205 | default n |
207 | help | 206 | help |
208 | This driver enables the ACPI to access the BMC controller. And it | 207 | This driver enables the ACPI to access the BMC controller. And it |
@@ -214,14 +213,13 @@ config ACPI_IPMI | |||
214 | 213 | ||
215 | config ACPI_HOTPLUG_CPU | 214 | config ACPI_HOTPLUG_CPU |
216 | bool | 215 | bool |
217 | depends on EXPERIMENTAL && ACPI_PROCESSOR && HOTPLUG_CPU | 216 | depends on ACPI_PROCESSOR && HOTPLUG_CPU |
218 | select ACPI_CONTAINER | 217 | select ACPI_CONTAINER |
219 | default y | 218 | default y |
220 | 219 | ||
221 | config ACPI_PROCESSOR_AGGREGATOR | 220 | config ACPI_PROCESSOR_AGGREGATOR |
222 | tristate "Processor Aggregator" | 221 | tristate "Processor Aggregator" |
223 | depends on ACPI_PROCESSOR | 222 | depends on ACPI_PROCESSOR |
224 | depends on EXPERIMENTAL | ||
225 | depends on X86 | 223 | depends on X86 |
226 | help | 224 | help |
227 | ACPI 4.0 defines processor Aggregator, which enables OS to perform | 225 | ACPI 4.0 defines processor Aggregator, which enables OS to perform |
@@ -337,8 +335,7 @@ config X86_PM_TIMER | |||
337 | systems require this timer. | 335 | systems require this timer. |
338 | 336 | ||
339 | config ACPI_CONTAINER | 337 | config ACPI_CONTAINER |
340 | tristate "Container and Module Devices (EXPERIMENTAL)" | 338 | tristate "Container and Module Devices" |
341 | depends on EXPERIMENTAL | ||
342 | default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO) | 339 | default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO) |
343 | help | 340 | help |
344 | This driver supports ACPI Container and Module devices (IDs | 341 | This driver supports ACPI Container and Module devices (IDs |