summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-01-09 17:16:29 +0100
committerArnd Bergmann <arnd@arndb.de>2012-01-09 17:16:29 +0100
commitdcf7ec5ee62a78123057a1e286c88ca739717409 (patch)
treefa3f19434638a942ba66d236dde4d9aaadf8b370 /arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
parentMerge branch 'drivers/rtc-sa1100' into next/drivers (diff)
parentMerge branch 'samsung/cleanup' into samsung/driver (diff)
downloadlinux-dcf7ec5ee62a78123057a1e286c88ca739717409.tar.xz
linux-dcf7ec5ee62a78123057a1e286c88ca739717409.zip
Merge branch 'samsung/driver' into next/drivers
Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-orion5x/rd88f5181l-ge-setup.c')
-rw-r--r--arch/arm/mach-orion5x/rd88f5181l-ge-setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index 05db2d336b08..c44eabaabc16 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -187,4 +187,5 @@ MACHINE_START(RD88F5181L_GE, "Marvell Orion-VoIP GE Reference Design")
.init_irq = orion5x_init_irq,
.timer = &orion5x_timer,
.fixup = tag_fixup_mem32,
+ .restart = orion5x_restart,
MACHINE_END