diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 16:56:34 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-03-09 16:56:34 +0900 |
| commit | 8ec46b97f24d60645c8f708c87e0caecebd25d77 (patch) | |
| tree | 3663c411f7a4e7a9bfc0a8e720679b93a5860b7c /arch/arm/mach-exynos/mach-exynos4-dt.c | |
| parent | b85b64cc22122adca695e0f8c340cc677ad92e8c (diff) | |
| parent | 6938d75a8c1a1752f9fa7ef14a0c570036c7b73b (diff) | |
| download | linux-8ec46b97f24d60645c8f708c87e0caecebd25d77.tar.gz linux-8ec46b97f24d60645c8f708c87e0caecebd25d77.tar.bz2 linux-8ec46b97f24d60645c8f708c87e0caecebd25d77.zip | |
Merge branch 'next/mct-exynos' into next/clk-exynos
Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos4-dt.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index fad268f8548c..daa7b0da9a2d 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c @@ -15,6 +15,7 @@ #include <linux/of_fdt.h> #include <linux/serial_core.h> #include <linux/memblock.h> +#include <linux/clocksource.h> #include <asm/mach/arch.h> #include <mach/map.h> @@ -158,7 +159,7 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") .map_io = exynos4_dt_map_io, .init_machine = exynos4_dt_machine_init, .init_late = exynos_init_late, - .init_time = exynos4_timer_init, + .init_time = clocksource_of_init, .dt_compat = exynos4_dt_compat, .restart = exynos4_restart, .reserve = exynos4_reserve, |