ARM: sunxi: fix struct sys_timer removal
authorStephen Warren <swarren@nvidia.com>
Tue, 8 Jan 2013 17:33:37 +0000 (10:33 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 8 Jan 2013 18:50:43 +0000 (10:50 -0800)
Commit 6bb27d7 "ARM: delete struct sys_timer" removed struct sys_timer,
but didn't update mach-sunxi/sunxi.c for this change, even though the
sunxi timer implementation itself was updated. This caused a build break:

arch/arm/mach-sunxi/sunxi.c:94:2: error: unknown field 'timer' specified in initializer
arch/arm/mach-sunxi/sunxi.c:94:12: error: 'sunxi_timer' undeclared here (not in a function)

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-sunxi/sunxi.c

index 9be910f7920b9d464f49bcb0e40c08f9ddf8e5cb..cba4cd3bf93a25bbebff27343c7dd3cb94b2d37f 100644 (file)
@@ -91,6 +91,6 @@ DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
        .init_irq       = sunxi_init_irq,
        .handle_irq     = sunxi_handle_irq,
        .restart        = sunxi_restart,
-       .timer          = &sunxi_timer,
+       .init_time      = &sunxi_timer_init,
        .dt_compat      = sunxi_board_dt_compat,
 MACHINE_END