diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-01-08 18:33:37 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 19:50:43 +0100 |
| commit | 1c2584c3a1c882fec729147a46d822522552e38c (patch) | |
| tree | b98c8280741ab37c43b7c1bc2cd73548b7feaac8 /arch | |
| parent | clocksource: add common of_clksrc_init() function (diff) | |
| download | linux-1c2584c3a1c882fec729147a46d822522552e38c.tar.xz linux-1c2584c3a1c882fec729147a46d822522552e38c.zip | |
ARM: sunxi: fix struct sys_timer removal
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>
Diffstat (limited to 'arch')
| -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 9be910f7920b..cba4cd3bf93a 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 |