diff options
author | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 |
---|---|---|
committer | Stephen Warren <swarren@wwwdotorg.org> | 2013-01-14 21:44:27 -0700 |
commit | b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6 (patch) | |
tree | ed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-sunxi | |
parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) | |
parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea (diff) | |
download | linux-b2fc382aad0a8f52803acdc3ac4e5540dbcdf1f6.tar.bz2 |
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Diffstat (limited to 'arch/arm/mach-sunxi')
-rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 1dc8a92e5a5f..6980cfa646f9 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/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 |