summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-01-10 23:00:54 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2012-03-13 13:45:54 +0000
commit9248510469b46bc17b90cf62cb8d9e7c9a5f9965 (patch)
tree2ee4164b056c9a0ba74941b46dbf7b228e67a293 /arch/arm/include/asm
parent58458e0327f7a34ef9c8bc512290bf47e3de811b (diff)
ARM: smp_twd: remove old local timer interface
Now that all users of the previous local timer interface have been converted to the runtime registration API, make this interface the only one supported for this driver. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/localtimer.h8
-rw-r--r--arch/arm/include/asm/smp_twd.h6
2 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/include/asm/localtimer.h b/arch/arm/include/asm/localtimer.h
index f088d63b92c..955eed10ffb 100644
--- a/arch/arm/include/asm/localtimer.h
+++ b/arch/arm/include/asm/localtimer.h
@@ -11,7 +11,6 @@
#define __ASM_ARM_LOCALTIMER_H
#include <linux/errno.h>
-#include <linux/interrupt.h>
struct clock_event_device;
@@ -26,13 +25,6 @@ struct local_timer_ops {
void percpu_timer_setup(void);
#ifdef CONFIG_LOCAL_TIMERS
-
-#ifdef CONFIG_HAVE_ARM_TWD
-
-#include "smp_twd.h"
-
-#endif
-
/*
* Stop the local timer
*/
diff --git a/arch/arm/include/asm/smp_twd.h b/arch/arm/include/asm/smp_twd.h
index 8047e6e580b..0f01f4677bd 100644
--- a/arch/arm/include/asm/smp_twd.h
+++ b/arch/arm/include/asm/smp_twd.h
@@ -20,12 +20,6 @@
#include <linux/ioport.h>
-struct clock_event_device;
-
-extern void __iomem *twd_base;
-
-int twd_timer_setup(struct clock_event_device *);
-
struct twd_local_timer {
struct resource res[2];
};