aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 07:00:38 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 07:00:38 -0400
commitbdc8f09685a25a12f2f5282f56672ba663ecb88c (patch)
treeb888dceb25d55ec0cd9790b246cd255c20e57e09 /drivers/acpi/scan.c
parentf4c9f402389977dc852ef4848c7615926306735d (diff)
parenteff9a4b62b14cf0d9913e3caf1f26f8b7a6105c9 (diff)
Merge branch 'acpi-assorted'
* acpi-assorted: ACPI / EC: Add HP Folio 13 to ec_dmi_table in order to skip DSDT scan ACPI: Add CMOS RTC Operation Region handler support ACPI: Remove unused flags in acpi_device_flags ACPI: Remove useless initializers ACPI / battery: Make sure all spaces are in correct places ACPI: add _STA evaluation at do_acpi_find_child() ACPI / EC: access user space with get_user()/put_user()
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index e0db2dc42370..dfe76f17cfc4 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2132,6 +2132,7 @@ int __init acpi_scan_init(void)
2132 acpi_processor_init(); 2132 acpi_processor_init();
2133 acpi_platform_init(); 2133 acpi_platform_init();
2134 acpi_lpss_init(); 2134 acpi_lpss_init();
2135 acpi_cmos_rtc_init();
2135 acpi_container_init(); 2136 acpi_container_init();
2136 acpi_memory_hotplug_init(); 2137 acpi_memory_hotplug_init();
2137 acpi_dock_init(); 2138 acpi_dock_init();