diff options
author | Toshi Kani <toshi.kani@hp.com> | 2013-02-11 17:33:20 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-13 07:46:45 -0500 |
commit | 64fd7401c5e4cf7c64452ecd9b700a55a5ebea50 (patch) | |
tree | ca27ac8fbb153424d354c5d0c3013f955f60b603 /include/linux/acpi.h | |
parent | 0aa120a0138398d6597350f4c1dcb46d14be1a0b (diff) |
ACPI: Remove the use of CONFIG_ACPI_CONTAINER_MODULE
config ACPI_CONTAINER has been changed to bool (y/n), and its
module option is no longer valid. So, remove the use of
CONFIG_ACPI_CONTAINER_MODULE.
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index c6ccd9fa8f08..bcbdd7484e58 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -363,8 +363,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, | |||
363 | #if defined(CONFIG_ACPI_HOTPLUG_CPU) && \ | 363 | #if defined(CONFIG_ACPI_HOTPLUG_CPU) && \ |
364 | (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \ | 364 | (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \ |
365 | defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \ | 365 | defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \ |
366 | (defined(CONFIG_ACPI_CONTAINER) || \ | 366 | defined(CONFIG_ACPI_CONTAINER) |
367 | defined(CONFIG_ACPI_CONTAINER_MODULE)) | ||
368 | #define ACPI_HOTPLUG_OST | 367 | #define ACPI_HOTPLUG_OST |
369 | #endif | 368 | #endif |
370 | 369 | ||