summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/timer.h
diff options
context:
space:
mode:
authorVarun Wadekar <vwadekar@nvidia.com>2012-08-09 16:24:31 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2012-08-09 16:24:31 +0530
commit8c7f6d982bd6643122608f3bd10af2e9d6c98f1b (patch)
treec8c4e69bd32a2a5a255b0377521e421e3e1e6c49 /arch/arm/mach-tegra/timer.h
parent67700cff6e41f78342c9eaa32e89492ca051a074 (diff)
ARM: Tegra: remove tegra_get_linear_age() from under CONFIG_HAVE_ARM_TWD
Change-Id: Ib106db20f587e53c95410fcc3d834c257b112a19 Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/timer.h')
-rw-r--r--arch/arm/mach-tegra/timer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/timer.h b/arch/arm/mach-tegra/timer.h
index ecb669b7f0b0..a483ecb9e866 100644
--- a/arch/arm/mach-tegra/timer.h
+++ b/arch/arm/mach-tegra/timer.h
@@ -48,19 +48,17 @@ struct tegra_twd_context {
};
void __init tegra_cpu_timer_init(void);
+int tegra_get_linear_age(void);
#ifdef CONFIG_HAVE_ARM_TWD
int tegra_twd_get_state(struct tegra_twd_context *context);
void tegra_twd_suspend(struct tegra_twd_context *context);
void tegra_twd_resume(struct tegra_twd_context *context);
-int tegra_get_linear_age(void);
#else
static inline int tegra_twd_get_state(struct tegra_twd_context *context)
{ return -ENODEV; }
static inline void tegra_twd_suspend(struct tegra_twd_context *context) {}
static inline void tegra_twd_resume(struct tegra_twd_context *context) {}
-static inline int tegra_get_linear_age()
-{ return -1; }
#endif
#ifdef CONFIG_ARM_ARCH_TIMER