mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'acpi-init'
* acpi-init:
clocksource: cosmetic: Drop OF 'dependency' from symbols
clocksource / arm_arch_timer: Convert to ACPI probing
clocksource: Add new CLKSRC_{PROBE,ACPI} config symbols
clocksource / ACPI: Add probing infrastructure for ACPI-based clocksources
irqchip / GIC: Convert the GIC driver to ACPI probing
irqchip / ACPI: Add probing infrastructure for ACPI-based irqchips
ACPI: Add early device probing infrastructure
This commit is contained in:
commit
e3ed766b49
32 changed files with 209 additions and 159 deletions
|
|
@ -324,7 +324,7 @@ void __init time_init(void)
|
|||
if (count < 2)
|
||||
panic("%d timer is found, it needs 2 timers in system\n", count);
|
||||
|
||||
clocksource_of_init();
|
||||
clocksource_probe();
|
||||
}
|
||||
|
||||
CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);
|
||||
|
|
|
|||
Loading…
Reference in a new issue