diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-25 22:55:14 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-10-25 22:55:14 +0100 |
| commit | e3ed766b4958bf7889539f09aec3f6a72d2c4dd2 (patch) | |
| tree | d6242edddfb436bff21894308d9280933e762433 /arch/nios2 | |
| parent | 343ccb040e60c3688d4413e839975fc3c8f9e287 (diff) | |
| parent | 3722ed2380ad6e89eaf81fcf93f06d605e740435 (diff) | |
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
Diffstat (limited to 'arch/nios2')
| -rw-r--r-- | arch/nios2/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c index bbc3f9157f9c..e835dda2bfe2 100644 --- a/arch/nios2/kernel/time.c +++ b/arch/nios2/kernel/time.c @@ -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); |