diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-12 11:46:58 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-12 11:46:58 +0800 |
| commit | 66e61060d7ad9fcf61475fb836fb5987db7a7ee0 (patch) | |
| tree | a0abe3fb2fa8858261dc41df9444c0e0ca85f1a6 /drivers/acpi/Kconfig | |
| parent | a89c3e956ae78cec8926b92f2d61b7a5b675e787 (diff) | |
| parent | f242e50eee1ec7692c4854d94e8cd543991cce71 (diff) | |
| download | linux-66e61060d7ad9fcf61475fb836fb5987db7a7ee0.tar.gz | |
Merge branch 'asoc-ab8500' into for-3.6
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 47768ff87343..80998958cf45 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -208,7 +208,7 @@ config ACPI_IPMI config ACPI_HOTPLUG_CPU bool - depends on ACPI_PROCESSOR && HOTPLUG_CPU + depends on EXPERIMENTAL && ACPI_PROCESSOR && HOTPLUG_CPU select ACPI_CONTAINER default y |