summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/board.h
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/board.h
parent786621308cfbb9421a54773e57dbdbe504c417cc (diff)
downloadtalos-obmc-linux-f2ef412d584ff9947f96990f08eaa1cf45ab8ca9.tar.gz
talos-obmc-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.h')
-rw-r--r--arch/arm/mach-tegra/board.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index f88e5143c767..91fbe733a21e 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -55,5 +55,5 @@ static inline int harmony_pcie_init(void) { return 0; }
void __init tegra_paz00_wifikill_init(void);
-extern struct sys_timer tegra_timer;
+extern struct sys_timer tegra_sys_timer;
#endif
OpenPOWER on IntegriCloud