diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-28 00:14:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-28 00:14:48 -0400 |
commit | c2e1ff39c106ab026e3feb29c038855b7ed00393 (patch) | |
tree | e0255b5b9aed8645edc4426f2d4972280910e065 /arch/arm/mach-exynos/mach-exynos4-dt.c | |
parent | 456d3d42460c1fc20ba0d27442443fcd63aaac35 (diff) | |
parent | b48b2c3e50433ff6f7e46186daa7f986bd960215 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pull in Linus's tree to get the commits that blew away
ARCH_USES_GETTIMEOFFSET but didn't update Sparc correctly, so
that I can apply Stephen Rothwell's fix for that mis-merge.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos4-dt.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index 8245f1c761d9..e7e9743543ac 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c | |||
@@ -83,6 +83,7 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") | |||
83 | .map_io = exynos4210_dt_map_io, | 83 | .map_io = exynos4210_dt_map_io, |
84 | .handle_irq = gic_handle_irq, | 84 | .handle_irq = gic_handle_irq, |
85 | .init_machine = exynos4210_dt_machine_init, | 85 | .init_machine = exynos4210_dt_machine_init, |
86 | .init_late = exynos_init_late, | ||
86 | .timer = &exynos4_timer, | 87 | .timer = &exynos4_timer, |
87 | .dt_compat = exynos4210_dt_compat, | 88 | .dt_compat = exynos4210_dt_compat, |
88 | .restart = exynos4_restart, | 89 | .restart = exynos4_restart, |