summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ep93xx/simone.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-ep93xx/simone.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-ep93xx/simone.c')
-rw-r--r--arch/arm/mach-ep93xx/simone.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c
index 52e090dc9d27..f4e553eca21c 100644
--- a/arch/arm/mach-ep93xx/simone.c
+++ b/arch/arm/mach-ep93xx/simone.c
@@ -25,6 +25,7 @@
#include <mach/fb.h>
#include <mach/gpio-ep93xx.h>
+#include <asm/hardware/vic.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -80,6 +81,8 @@ MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board")
.atag_offset = 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
+ .handle_irq = vic_handle_irq,
.timer = &ep93xx_timer,
.init_machine = simone_init_machine,
+ .restart = ep93xx_restart,
MACHINE_END