diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-29 09:35:27 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-29 09:35:27 -0800 |
commit | 440f39a4fda5d80f290e32f67bd084b63a41a436 (patch) | |
tree | 913be35b58a374ad3757e937e5f2b23486bb9dd4 /arch/arm/mach-orion5x/ts78xx-setup.c | |
parent | 7734a93bf7553042a339748dad6e4961d94cfa28 (diff) | |
parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) |
Merge branch 'depends/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-orion5x/ts78xx-setup.c')
-rw-r--r-- | arch/arm/mach-orion5x/ts78xx-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index b0727dcd1ef..e960855d32a 100644 --- a/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/arch/arm/mach-orion5x/ts78xx-setup.c @@ -619,6 +619,6 @@ MACHINE_START(TS78XX, "Technologic Systems TS-78xx SBC") .map_io = ts78xx_map_io, .init_early = orion5x_init_early, .init_irq = orion5x_init_irq, - .timer = &orion5x_timer, + .init_time = orion5x_timer_init, .restart = orion5x_restart, MACHINE_END |