diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-05-02 16:11:12 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-05-02 16:11:12 +0200 |
| commit | 604a98f1df2897f9ea6ca6bdab8e1c2d6844be01 (patch) | |
| tree | 99471700986d14cd5cace3e535dfcbd0e07464cb /drivers/acpi/scan.c | |
| parent | 1cfd904f16740df21b2df7b41c7a0dc00cbd434c (diff) | |
| parent | 7dba33c6346c337aac3f7cd188137d4a6d3d1f3a (diff) | |
Merge branch 'timers/urgent' into timers/core
Pick up urgent fixes to apply dependent cleanup patch
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index cc234e6a6297..970dd87d347c 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -2166,10 +2166,10 @@ int __init acpi_scan_init(void) acpi_cmos_rtc_init(); acpi_container_init(); acpi_memory_hotplug_init(); + acpi_watchdog_init(); acpi_pnp_init(); acpi_int340x_thermal_init(); acpi_amba_init(); - acpi_watchdog_init(); acpi_init_lpit(); acpi_scan_add_handler(&generic_device_handler); |