aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-04-01 16:29:56 +0800
committerShawn Guo <shawn.guo@linaro.org>2013-04-01 16:29:56 +0800
commit3ed628a8122112ee796cd643e2478c4a6def234c (patch)
tree1e5e352eb501a2afa173989415a8b4896d4999a5 /arch/arm/include
parent07961ac7c0ee8b546658717034fe692fd12eefa9 (diff)
parentda4a686a2cfb077a8bfc1697f597e7f86235b822 (diff)
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/smp_twd.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h
index 0f01f4677bd..7b2899c2f7f 100644
--- a/arch/arm/include/asm/smp_twd.h
+++ b/arch/arm/include/asm/smp_twd.h
@@ -34,12 +34,4 @@ struct twd_local_timer name __initdata = { \
int twd_local_timer_register(struct twd_local_timer *);
-#ifdef CONFIG_HAVE_ARM_TWD
-void twd_local_timer_of_register(void);
-#else
-static inline void twd_local_timer_of_register(void)
-{
-}
-#endif
-
#endif