diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:38 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-06-07 08:49:38 -0500 |
| commit | 72ed528a948b151e7be5ce03ed3d2b88a229dd0a (patch) | |
| tree | 0f90590c0faf6fcc85f26f92facc653112be53e0 /cpu/ixp/timer.c | |
| parent | 9f37dc8cabc94aed27aec8b4c69a390c8603fd28 (diff) | |
| parent | e461a24113c66747510b07930a83b0d84171a559 (diff) | |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'cpu/ixp/timer.c')
| -rw-r--r-- | cpu/ixp/timer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpu/ixp/timer.c b/cpu/ixp/timer.c index 8df2a31f5c..920f34e612 100644 --- a/cpu/ixp/timer.c +++ b/cpu/ixp/timer.c @@ -1,5 +1,7 @@ -/* vi: set ts=8 sw=8 noet: */ /* + * (C) Copyright 2006 + * Stefan Roese, DENX Software Engineering, sr@denx.de. + * * (C) Copyright 2002 * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Marius Groeger <mgroeger@sysgo.de> @@ -30,6 +32,7 @@ #include <common.h> #include <asm/arch/ixp425.h> +#ifndef CONFIG_USE_IRQ ulong get_timer (ulong base) { return get_timer_masked () - base; @@ -77,3 +80,4 @@ ulong get_timer_masked (void) } return (reload_constant - current); } +#endif /* #ifndef CONFIG_USE_IRQ */ |