From: Toshi Kani Date: Mon, 11 Feb 2013 22:33:20 +0000 (+0000) Subject: ACPI: Remove the use of CONFIG_ACPI_CONTAINER_MODULE X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=64fd7401c5e4cf7c64452ecd9b700a55a5ebea50;p=linux-beck.git 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 Signed-off-by: Rafael J. Wysocki --- 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, #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