summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board.h
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-01-28 21:20:34 +0400
committerStephen Warren <swarren@nvidia.com>2013-01-28 21:20:34 +0400
commitf3dab3989b4282e448cba0f0708934276dcb413a (patch)
treeed79658afd978b1e52ace0fb58d1628b79c0f78b /arch/arm/mach-tegra/board.h
parent9931faca02c604c22335f5a935a501bb2ace6e20 (diff)
parent90cf214d6a549bf482e3c5751ee256cc885b96ea (diff)
downloadlinux-f3dab3989b4282e448cba0f0708934276dcb413a.tar.xz
Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into for-3.9/cleanup
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 91fbe733a21e..744cdd246f6a 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_sys_timer;
+extern void tegra_init_timer(void);
#endif