projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'evk1100-prep'
[oweals/u-boot.git]
/
cpu
/
ixp
/
timer.c
diff --git
a/cpu/ixp/timer.c
b/cpu/ixp/timer.c
index 09d8ad56020c969c738f2f10d0d7f68d47101ff5..deb227a1a63742fe15a56e5d180b4e3693396d60 100644
(file)
--- a/
cpu/ixp/timer.c
+++ b/
cpu/ixp/timer.c
@@
-32,7
+32,6
@@
#include <common.h>
#include <asm/arch/ixp425.h>
-#ifndef CONFIG_USE_IRQ
ulong get_timer (ulong base)
{
return get_timer_masked () - base;
@@
-80,4
+79,3
@@
ulong get_timer_masked (void)
}
return (reload_constant - current);
}
-#endif /* #ifndef CONFIG_USE_IRQ */