diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-09-16 20:32:10 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-09-16 20:32:10 +0200 |
| commit | 7201cfc4a79c0f55f5ebee73c5a626a49cb53f73 (patch) | |
| tree | 2c54f0a438a5ca915d88f8badab217b8ae993f11 /cpu/microblaze/timer.c | |
| parent | fd64975a882ca654f3139385791cdd237d6acc53 (diff) | |
| parent | 991b089d1ce5ad945725e3657a8f106dfa02a38e (diff) | |
| download | olio-uboot-2014.01-7201cfc4a79c0f55f5ebee73c5a626a49cb53f73.tar.xz olio-uboot-2014.01-7201cfc4a79c0f55f5ebee73c5a626a49cb53f73.zip | |
Merge branch 'master' of /home/uboot/070912/u-boot-microblaze/
Diffstat (limited to 'cpu/microblaze/timer.c')
| -rw-r--r-- | cpu/microblaze/timer.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/cpu/microblaze/timer.c b/cpu/microblaze/timer.c index b35045344..ab1cb1274 100644 --- a/cpu/microblaze/timer.c +++ b/cpu/microblaze/timer.c @@ -33,17 +33,10 @@ void reset_timer (void) timestamp = 0; } -#ifdef CFG_TIMER_0 ulong get_timer (ulong base) { return (timestamp - base); } -#else -ulong get_timer (ulong base) -{ - return (timestamp++ - base); -} -#endif void set_timer (ulong t) { |