diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2012-10-16 12:08:35 +0200 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-10-16 19:14:40 +0200 |
| commit | f2ef412d584ff9947f96990f08eaa1cf45ab8ca9 (patch) | |
| tree | 9e457c4a2e83754a0062f5413c0e0ecb9d0a16c7 /arch/arm/mach-tegra/board-dt-tegra20.c | |
| parent | ARM: tegra30: clk: Fix output_rate overflow (diff) | |
| download | linux-f2ef412d584ff9947f96990f08eaa1cf45ab8ca9.tar.xz linux-f2ef412d584ff9947f96990f08eaa1cf45ab8ca9.zip | |
ARM: tegra: rename tegra system timer
The timer variable is renamed to avoid confusion and symbol name clash
with the tegra_timer clock.
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-dt-tegra20.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 57e235f4ac74..aa5325cd1c42 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -182,7 +182,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") .init_early = tegra20_init_early, .init_irq = tegra_dt_init_irq, .handle_irq = gic_handle_irq, - .timer = &tegra_timer, + .timer = &tegra_sys_timer, .init_machine = tegra_dt_init, .init_late = tegra_dt_init_late, .restart = tegra_assert_system_reset, |