diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-08 10:51:01 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 10:51:19 -0800 |
| commit | fd41d91df99be02f4fc3fe79d707d2786d6e40eb (patch) | |
| tree | 10fdd9626f5085e9b2c22204aea949a6bc0d8bba /arch/arm/mach-sunxi | |
| parent | 981302783e891482d767ce90b04ed37159d2ebf8 (diff) | |
| parent | 1c2584c3a1c882fec729147a46d822522552e38c (diff) | |
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>
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 |