diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 09:21:44 -0800 |
| commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
| tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-orion5x/lsmini-setup.c | |
| parent | 3ad06d1a7dfd99a2e8f3a41e0fa5118551186d3c (diff) | |
| parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-orion5x/lsmini-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/lsmini-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c index 949eaa8f12e3..8e3965c6c0fe 100644 --- a/arch/arm/mach-orion5x/lsmini-setup.c +++ b/arch/arm/mach-orion5x/lsmini-setup.c @@ -271,7 +271,7 @@ MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini") .map_io = orion5x_map_io, .init_early = orion5x_init_early, .init_irq = orion5x_init_irq, - .timer = &orion5x_timer, + .init_time = orion5x_timer_init, .fixup = tag_fixup_mem32, .restart = orion5x_restart, MACHINE_END |