diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
| commit | 7e31842441776b4d6ec7fd916c91663ad05b7814 (patch) | |
| tree | 8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /drivers/acpi/bus.c | |
| parent | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff) | |
| parent | b1d248d96c71665c79befb81207f38f894c7c082 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 310e3b9749c..d68bd61072b 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -935,6 +935,12 @@ 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(); /* @@ -1026,7 +1032,6 @@ 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(); |