summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hp.com>2013-02-11 22:33:20 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-13 13:46:45 +0100
commit64fd7401c5e4cf7c64452ecd9b700a55a5ebea50 (patch)
treeca27ac8fbb153424d354c5d0c3013f955f60b603 /include/linux/acpi.h
parent0aa120a0138398d6597350f4c1dcb46d14be1a0b (diff)
downloadop-kernel-dev-64fd7401c5e4cf7c64452ecd9b700a55a5ebea50.zip
op-kernel-dev-64fd7401c5e4cf7c64452ecd9b700a55a5ebea50.tar.gz
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.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index c6ccd9f..bcbdd74 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,
#if defined(CONFIG_ACPI_HOTPLUG_CPU) && \
(defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \
defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \
- (defined(CONFIG_ACPI_CONTAINER) || \
- defined(CONFIG_ACPI_CONTAINER_MODULE))
+ defined(CONFIG_ACPI_CONTAINER)
#define ACPI_HOTPLUG_OST
#endif
OpenPOWER on IntegriCloud