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/arm/mach-shmobile/setup-rcar-gen2.c | |
| parent | Merge branches 'acpi-scan', 'acpi-tables', 'acpi-ec' and 'acpi-assorted' (diff) | |
| parent | clocksource: cosmetic: Drop OF 'dependency' from symbols (diff) | |
| download | linux-e3ed766b4958bf7889539f09aec3f6a72d2c4dd2.tar.xz linux-e3ed766b4958bf7889539f09aec3f6a72d2c4dd2.zip | |
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/arm/mach-shmobile/setup-rcar-gen2.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index aa3339258d9c..9eccde3c7b13 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -128,7 +128,7 @@ void __init rcar_gen2_timer_init(void) #endif /* CONFIG_ARM_ARCH_TIMER */ rcar_gen2_clocks_init(mode); - clocksource_of_init(); + clocksource_probe(); } struct memory_reserve_config { |