aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-04-27 13:18:42 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2012-04-27 13:39:25 +0100
commitfb8a99f9f6bdc908cbbd2284cee80c709d9f7c03 (patch)
treec99ea6cd79714e25e016c7270e5191b0e9dfcd6f /arch/arm/include/asm
parent120f3d6c2309cde8b93310267ed11a9b5aa2aad4 (diff)
ARM: architected timers: remove support for non DT platforms
All mainline platforms using the ARM architected timers are DT only. As such, remove the ad-hoc support that is not longer needed anymore. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch_timer.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index 935897f120b..ed2e95d46e2 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -1,22 +1,10 @@
#ifndef __ASMARM_ARCH_TIMER_H
#define __ASMARM_ARCH_TIMER_H
-#include <linux/ioport.h>
-
-struct arch_timer {
- struct resource res[2];
-};
-
#ifdef CONFIG_ARM_ARCH_TIMER
-int arch_timer_register(struct arch_timer *);
-int arch_timer_sched_clock_init(void);
int arch_timer_of_register(void);
+int arch_timer_sched_clock_init(void);
#else
-static inline int arch_timer_register(struct arch_timer *at)
-{
- return -ENXIO;
-}
-
static inline int arch_timer_of_register(void)
{
return -ENXIO;