diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 12:54:15 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-28 12:54:15 -0500 |
| commit | 7266d48fca8ee2a15d15222c41f887e10db54c5a (patch) | |
| tree | 775404bcbf8ce146ccaba905e841a3621ae7ce80 /arch/arm/mach-exynos/mach-exynos5-dt.c | |
| parent | 168268a225d24da3768a88c1029fb3014b0837ca (diff) | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
Merge branch 'timer/cleanup' into late/mvebu2
Basing the mvebu patches on top of the timer cleanup
avoids some nasty merges.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos5-dt.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index e99d3d8f2bcf..4e074c67cc8b 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
| @@ -182,7 +182,7 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") | |||
| 182 | .handle_irq = gic_handle_irq, | 182 | .handle_irq = gic_handle_irq, |
| 183 | .init_machine = exynos5_dt_machine_init, | 183 | .init_machine = exynos5_dt_machine_init, |
| 184 | .init_late = exynos_init_late, | 184 | .init_late = exynos_init_late, |
| 185 | .timer = &exynos4_timer, | 185 | .init_time = exynos4_timer_init, |
| 186 | .dt_compat = exynos5_dt_compat, | 186 | .dt_compat = exynos5_dt_compat, |
| 187 | .restart = exynos5_restart, | 187 | .restart = exynos5_restart, |
| 188 | .reserve = exynos5_reserve, | 188 | .reserve = exynos5_reserve, |