summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ep93xx/vision_ep9307.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-11 21:21:44 +0400
committerOlof Johansson <olof@lixom.net>2013-02-11 21:21:44 +0400
commit5f48a29f1721736930b7817b430039c1d348dd05 (patch)
tree69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-ep93xx/vision_ep9307.c
parent3ad06d1a7dfd99a2e8f3a41e0fa5118551186d3c (diff)
parentf8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff)
downloadlinux-5f48a29f1721736930b7817b430039c1d348dd05.tar.xz
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-ep93xx/vision_ep9307.c')
-rw-r--r--arch/arm/mach-ep93xx/vision_ep9307.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
index 723d048176db..605956fd07a2 100644
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -363,7 +363,7 @@ MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307")
.atag_offset = 0x100,
.map_io = vision_map_io,
.init_irq = ep93xx_init_irq,
- .timer = &ep93xx_timer,
+ .init_time = ep93xx_timer_init,
.init_machine = vision_init_machine,
.init_late = ep93xx_init_late,
.restart = ep93xx_restart,