diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-27 23:03:23 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-27 23:03:34 -0800 |
commit | 66eae035dc59755c51ad3b3c718a5ed7535322e3 (patch) | |
tree | a30f914378e8c72c2885d2d53551d6e3fbf4bd6d /arch/arm/mach-h720x/h7202-eval.c | |
parent | d128bc9131225f830fe7ba8c75b2b859348fddd4 (diff) | |
parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
download | blackbird-op-linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.tar.gz blackbird-op-linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.zip |
Merge branch 'depends/cleanup' into next/soc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-h720x/h7202-eval.c')
-rw-r--r-- | arch/arm/mach-h720x/h7202-eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c index 169673036c59..f68e967a2062 100644 --- a/arch/arm/mach-h720x/h7202-eval.c +++ b/arch/arm/mach-h720x/h7202-eval.c @@ -74,7 +74,7 @@ MACHINE_START(H7202, "Hynix HMS30C7202") .atag_offset = 0x100, .map_io = h720x_map_io, .init_irq = h7202_init_irq, - .timer = &h7202_timer, + .init_time = h7202_timer_init, .init_machine = init_eval_h7202, .dma_zone_size = SZ_256M, .restart = h720x_restart, |