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-origen.c | |
| parent | b85b64cc22122adca695e0f8c340cc677ad92e8c (diff) | |
| parent | 6938d75a8c1a1752f9fa7ef14a0c570036c7b73b (diff) | |
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-origen.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 579d2d171da..1772cd284f4 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c @@ -815,7 +815,7 @@ MACHINE_START(ORIGEN, "ORIGEN") .map_io = origen_map_io, .init_machine = origen_machine_init, .init_late = exynos_init_late, - .init_time = exynos4_timer_init, + .init_time = mct_init, .reserve = &origen_reserve, .restart = exynos4_restart, MACHINE_END |