diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 18:35:27 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 18:35:27 +0100 |
| commit | 440f39a4fda5d80f290e32f67bd084b63a41a436 (patch) | |
| tree | 913be35b58a374ad3757e937e5f2b23486bb9dd4 /arch/arm/mach-pxa/tosa.c | |
| parent | Merge tag 'davinci-for-v3.9/dt' of git://gitorious.org/linux-davinci/linux-da... (diff) | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| download | linux-440f39a4fda5d80f290e32f67bd084b63a41a436.tar.xz linux-440f39a4fda5d80f290e32f67bd084b63a41a436.zip | |
Merge branch 'depends/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 233629edf7ee..9e7998d3635f 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -982,6 +982,6 @@ MACHINE_START(TOSA, "SHARP Tosa") .init_irq = pxa25x_init_irq, .handle_irq = pxa25x_handle_irq, .init_machine = tosa_init, - .timer = &pxa_timer, + .init_time = pxa_timer_init, .restart = tosa_restart, MACHINE_END |