Merge branch 'timer/cleanup' into next/cleanup

Adding a manually applied bugfix for sunxi.

* timer/cleanup:
  ARM: sunxi: fix struct sys_timer removal
Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/mach-sunxi/sunxi.c

@@ -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