ACPICA: Utilities: Add support to read table from files

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / container.c

diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 63119d09b35432e3200a33c0202c9e7cb7ec2f15..76f7cff645945ac6bf08788a8d3670286c9750c4 100644 (file)
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -41,6 +41,8 @@ static const struct acpi_device_id container_device_ids[] = {
        {"", 0},
 };
 
+#ifdef CONFIG_ACPI_CONTAINER
+
 static int acpi_container_offline(struct container_dev *cdev)
 {
        struct acpi_device *adev = ACPI_COMPANION(&cdev->dev);
@@ -107,7 +109,20 @@ static struct acpi_scan_handler container_handler = {
        },
 };
 
+void __init acpi_container_init(void)
+{
+       acpi_scan_add_handler(&container_handler);
+}
+
+#else
+
+static struct acpi_scan_handler container_handler = {
+       .ids = container_device_ids,
+};
+
 void __init acpi_container_init(void)
 {
        acpi_scan_add_handler_with_hotplug(&container_handler, "container");
 }
+
+#endif /* CONFIG_ACPI_CONTAINER */