aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-05-21 23:14:53 +0200
committerWolfgang Denk <wd@denx.de>2010-05-21 23:14:53 +0200
commit40792d675a609c83621d098e48a89de07463b3cd (patch)
tree14c118f3622bd76c5fd053ca23ca4ce60557cba3
parent92381c41c718d260476d5c636c473f50e3b5a79c (diff)
downloadu-boot-linaro-stable-40792d675a609c83621d098e48a89de07463b3cd.tar.gz
a320evb: fix udelay / __udelay confusion
Fix the following compiler problems: arch/arm/cpu/arm920t/a320/liba320.a(timer.o): In function `udelay': /home/wd/git/u-boot/work/arch/arm/cpu/arm920t/a320/timer.c:160: multiple definition of `udelay' lib/libgeneric.a(time.o):/home/wd/git/u-boot/work/lib/time.c:34: first defined here lib/libgeneric.a(time.o): In function `udelay': time.c:(.text+0x1c): undefined reference to `__udelay' Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--arch/arm/cpu/arm920t/a320/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c
index d69dbff0e..d2e316fd5 100644
--- a/arch/arm/cpu/arm920t/a320/timer.c
+++ b/arch/arm/cpu/arm920t/a320/timer.c
@@ -156,7 +156,7 @@ void set_timer(ulong t)
}
/* delay x useconds AND preserve advance timestamp value */
-void udelay(unsigned long usec)
+void __udelay(unsigned long usec)
{
long tmo = usec * (TIMER_CLOCK / 1000) / 1000;
unsigned long now, last = readl(&tmr->timer3_counter);