summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ep93xx/snappercl15.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-27 23:03:23 -0800
committerOlof Johansson <olof@lixom.net>2013-01-27 23:03:34 -0800
commit66eae035dc59755c51ad3b3c718a5ed7535322e3 (patch)
treea30f914378e8c72c2885d2d53551d6e3fbf4bd6d /arch/arm/mach-ep93xx/snappercl15.c
parentd128bc9131225f830fe7ba8c75b2b859348fddd4 (diff)
parentf8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff)
Merge branch 'depends/cleanup' into next/soc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-ep93xx/snappercl15.c')
-rw-r--r--arch/arm/mach-ep93xx/snappercl15.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index 50043eef1cf..aa86f86638d 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -31,7 +31,6 @@
#include <linux/platform_data/video-ep93xx.h>
#include <mach/gpio-ep93xx.h>
-#include <asm/hardware/vic.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -176,8 +175,7 @@ MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15")
.atag_offset = 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
- .handle_irq = vic_handle_irq,
- .timer = &ep93xx_timer,
+ .init_time = ep93xx_timer_init,
.init_machine = snappercl15_init_machine,
.init_late = ep93xx_init_late,
.restart = ep93xx_restart,