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>

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 17b5b596764100ae14400437b86e84b0c068291f..353ba256f3681e4f6ddd8b18b9feba61b1d98cec 100644 (file)
--- 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