aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/sa1100
diff options
context:
space:
mode:
authorGraeme Russ2011-07-15 02:21:14 +0000
committerWolfgang Denk2011-07-26 14:54:15 +0200
commit17659d7de9e4905f8d06966c2354c87cdeb8b703 (patch)
treefc9971a9c9402efeb28c2e7e7cc3ffceba8041d8 /arch/arm/cpu/sa1100
parent53fc43c68243d5278e522c92002fce3b8cc979a9 (diff)
Timer: Remove reset_timer_masked()
In some circumstances, reset_timer_masked() was called be timer_init() in order to perform architecture specific timer initialisation. In such cases, the required code in reset_timer_masked() has been moved into timer_init()
Diffstat (limited to 'arch/arm/cpu/sa1100')
-rw-r--r--arch/arm/cpu/sa1100/timer.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 694c03ab178..53bec0b760d 100644
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -44,12 +44,6 @@ void __udelay (unsigned long usec)
udelay_masked (usec);
}
-
-void reset_timer_masked (void)
-{
- OSCR = 0;
-}
-
ulong get_timer_masked (void)
{
return OSCR;