diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 18:21:44 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 18:21:44 +0100 |
| commit | 5f48a29f1721736930b7817b430039c1d348dd05 (patch) | |
| tree | 69c47c1105d275810123785a947227b9aa8028d6 /arch/arm/mach-pxa/icontrol.c | |
| parent | Merge branch 'depends/rmk-psci' into next/virt (diff) | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| download | linux-5f48a29f1721736930b7817b430039c1d348dd05.tar.xz linux-5f48a29f1721736930b7817b430039c1d348dd05.zip | |
Merge branch 'depends/cleanup' into next/virt
Diffstat (limited to 'arch/arm/mach-pxa/icontrol.c')
| -rw-r--r-- | arch/arm/mach-pxa/icontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c index 1d02eabc9c65..fe31bfcbb8df 100644 --- a/arch/arm/mach-pxa/icontrol.c +++ b/arch/arm/mach-pxa/icontrol.c @@ -196,7 +196,7 @@ MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") .nr_irqs = PXA_NR_IRQS, .init_irq = pxa3xx_init_irq, .handle_irq = pxa3xx_handle_irq, - .timer = &pxa_timer, + .init_time = pxa_timer_init, .init_machine = icontrol_init, .restart = pxa_restart, MACHINE_END |