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.k...@hp.com>
---
 include/linux/acpi.h |    3 +--
 1 file changed, 1 insertion(+), 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
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to