aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/cpu/pxa
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-07-15 02:19:44 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 14:53:30 +0200
commit4769be21cca65f1e7bef27bc024d886842bc6bad (patch)
tree47053c2ed79e6e43b1b6fd49b585fe53028ff6a5 /arch/arm/cpu/pxa
parente110c4fe44edc34addee4839a1d20c0fbb076ad4 (diff)
downloadu-boot-linaro-stable-4769be21cca65f1e7bef27bc024d886842bc6bad.tar.gz
Timer: Remove reset_timer() for non-Nios2 arches
Diffstat (limited to 'arch/arm/cpu/pxa')
-rw-r--r--arch/arm/cpu/pxa/timer.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
index 8900a705d..44dae9a98 100644
--- a/arch/arm/cpu/pxa/timer.c
+++ b/arch/arm/cpu/pxa/timer.c
@@ -59,16 +59,11 @@ static inline unsigned long long us_to_tick(unsigned long long us)
int timer_init (void)
{
- reset_timer();
+ reset_timer_masked();
return 0;
}
-void reset_timer (void)
-{
- reset_timer_masked ();
-}
-
ulong get_timer (ulong base)
{
return get_timer_masked () - base;