revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

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

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index d68bd61072bb797e3e7f0413d6b97a9650f99222..310e3b9749cbbacdabb3c03d288a6b42874aa41b 100644 (file)
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -935,12 +935,6 @@ static int __init acpi_bus_init(void)
                goto error1;
        }
 
-       /*
-        * _PDC control method may load dynamic SSDT tables,
-        * and we need to install the table handler before that.
-        */
-       acpi_sysfs_init();
-
        acpi_early_processor_set_pdc();
 
        /*
@@ -1032,6 +1026,7 @@ static int __init acpi_init(void)
        acpi_scan_init();
        acpi_ec_init();
        acpi_power_init();
+       acpi_sysfs_init();
        acpi_debugfs_init();
        acpi_sleep_proc_init();
        acpi_wakeup_device_init();