summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-02-17 15:12:36 -0800
committerTony Lindgren <tony@atomide.com>2012-02-17 15:12:36 -0800
commit4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4 (patch)
tree72e500b97c4bdcb9631209f3121f42b05ae30fea /arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
parent40c0591f0a349ec074357e05c6ab1a3bc951807c (diff)
parent19bfb76ca32f8e4fa80746608ff4a77707f40520 (diff)
downloadtalos-op-linux-4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4.tar.gz
talos-op-linux-4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4.zip
Merge branch 'for_3.4/dt_base' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c')
-rw-r--r--arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
index 9a1e917352f7..85f6169c2484 100644
--- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
@@ -169,4 +169,5 @@ MACHINE_START(MV88F6281GTW_GE, "Marvell 88F6281 GTW GE Board")
.init_early = kirkwood_init_early,
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
+ .restart = kirkwood_restart,
MACHINE_END
OpenPOWER on IntegriCloud