diff options
| author | Toshi Kani <toshi.kani@hp.com> | 2013-06-18 23:06:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-19 01:02:50 +0200 |
| commit | 08f502c1c343031f0d126bd00e87dede38269d12 (patch) | |
| tree | 85e6f82a7c6e3edf0f68d9c1f73b8921643ea9db | |
| parent | ACPI / cpufreq: Add ACPI processor device IDs to acpi-cpufreq (diff) | |
| download | linux-08f502c1c343031f0d126bd00e87dede38269d12.tar.xz linux-08f502c1c343031f0d126bd00e87dede38269d12.zip | |
ACPI: Do not use CONFIG_ACPI_HOTPLUG_MEMORY_MODULE
CONFIG_ACPI_HOTPLUG_MEMORY has been changed to bool (y/n), and
its module option is no longer valid. So, stop using
CONFIG_ACPI_HOTPLUG_MEMORY_MODULE.
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -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 17b5b5967641..353ba256f368 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -352,8 +352,7 @@ extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, /* Enable _OST when all relevant hotplug operations are enabled */ #if defined(CONFIG_ACPI_HOTPLUG_CPU) && \ - (defined(CONFIG_ACPI_HOTPLUG_MEMORY) || \ - defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)) && \ + defined(CONFIG_ACPI_HOTPLUG_MEMORY) && \ defined(CONFIG_ACPI_CONTAINER) #define ACPI_HOTPLUG_OST #endif |