1 files changed, 3 insertions, 20 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c54d7b6c4066..b7308efce458 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -11,6 +11,8 @@
 
 #include <acpi/acpi_drivers.h>
 
+#include "internal.h"
+
 #define _COMPONENT              ACPI_BUS_COMPONENT
 ACPI_MODULE_NAME("scan");
 #define STRUCT_TO_INT(s)        (*((int*)&s))
@@ -395,22 +397,10 @@ static int acpi_device_remove(struct device * dev)
         return 0;
 }
 
-static void acpi_device_shutdown(struct device *dev)
-{
-        struct acpi_device *acpi_dev = to_acpi_device(dev);
-        struct acpi_driver *acpi_drv = acpi_dev->driver;
-
-        if (acpi_drv && acpi_drv->ops.shutdown)
-                acpi_drv->ops.shutdown(acpi_dev);
-
-        return ;
-}
-
 struct bus_type acpi_bus_type = {
         .name           = "acpi",
         .suspend        = acpi_device_suspend,
         .resume         = acpi_device_resume,
-        .shutdown       = acpi_device_shutdown,
         .match          = acpi_bus_match,
         .probe          = acpi_device_probe,
         .remove         = acpi_device_remove,
@@ -1524,16 +1514,11 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
         return result;
 }
 
-
-static int __init acpi_scan_init(void)
+int __init acpi_scan_init(void)
 {
         int result;
         struct acpi_bus_ops ops;
 
-
-        if (acpi_disabled)
-                return 0;
-
         memset(&ops, 0, sizeof(ops));
         ops.acpi_op_add = 1;
         ops.acpi_op_start = 1;
@@ -1566,5 +1551,3 @@ static int __init acpi_scan_init(void)
       Done:
         return result;
 }
-
-subsys_initcall(acpi_scan_init);