summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/smp_twd.h
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-04-08 21:36:54 +0200
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-04-08 21:36:54 +0200
commit0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6 (patch)
tree7559859702f2fa02f6a4db64cf10f6c2e3f80c21 /arch/arm/include/asm/smp_twd.h
parent6dbe51c251a327e012439c4772097a13df43c5b8 (diff)
parent3d5a96582303e28c48699f3faaf920ef7d43e6f2 (diff)
downloadolio-linux-3.10-0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6.tar.xz
olio-linux-3.10-0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6.zip
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into sunxi/core-for-3.10
Diffstat (limited to 'arch/arm/include/asm/smp_twd.h')
-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