diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-01 21:24:38 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-01 21:24:38 +0100 |
| commit | f4b6f45dcba989f5a900edc07ececae80c79abdf (patch) | |
| tree | 85e623dc76eba877275c5978a6527f368975abb2 /cpu/ixp/timer.c | |
| parent | a87fb1b308a2a375cb9ca74ca0dd3e2c5793d3bf (diff) | |
| parent | 930590f3e49c8f32256edf2e5861e1535a329c6c (diff) | |
| download | u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.zip u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.tar.gz u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ixp
Diffstat (limited to 'cpu/ixp/timer.c')
| -rw-r--r-- | cpu/ixp/timer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cpu/ixp/timer.c b/cpu/ixp/timer.c index 09d8ad5..deb227a 100644 --- 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 */ |