diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-15 22:38:34 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-15 22:38:34 (GMT) |
| commit | bb3bcfa2426cc6a0aecec7270e3ee67ca843a125 (patch) | |
| tree | 0314e3d8e8d9e4d568a496fca27db33d66e68bb4 /lib_sparc | |
| parent | a200a7c04d89853d2a1395b96d8ca5e3dd754551 (diff) | |
| parent | 4b142febff71eabdb7ddbb125c7b583b24ddc434 (diff) | |
| download | u-boot-fsl-qoriq-bb3bcfa2426cc6a0aecec7270e3ee67ca843a125.tar.xz | |
Merge branch 'next' of ../next
Diffstat (limited to 'lib_sparc')
| -rw-r--r-- | lib_sparc/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_sparc/time.c b/lib_sparc/time.c index 433f3eb..82b2a3a 100644 --- a/lib_sparc/time.c +++ b/lib_sparc/time.c @@ -53,7 +53,7 @@ unsigned long usec2ticks(unsigned long usec) * microseconds to wait) into a number of time base ticks; then we * watch the time base until it has incremented by that amount. */ -void udelay(unsigned long usec) +void __udelay(unsigned long usec) { ulong ticks = usec2ticks(usec); |