summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/timer.c
diff options
context:
space:
mode:
authorSivaram Nair <sivaramn@nvidia.com>2012-10-16 13:08:35 +0300
committerStephen Warren <swarren@nvidia.com>2012-10-16 11:14:40 -0600
commitf2ef412d584ff9947f96990f08eaa1cf45ab8ca9 (patch)
tree9e457c4a2e83754a0062f5413c0e0ecb9d0a16c7 /arch/arm/mach-tegra/timer.c
parent786621308cfbb9421a54773e57dbdbe504c417cc (diff)
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/timer.c')
-rw-r--r--arch/arm/mach-tegra/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index eccdce98304..d3b8c8e7368 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -245,7 +245,7 @@ static void __init tegra_init_timer(void)
register_persistent_clock(NULL, tegra_read_persistent_clock);
}
-struct sys_timer tegra_timer = {
+struct sys_timer tegra_sys_timer = {
.init = tegra_init_timer,
};