Skip to contentSkip to conversation

a320evb: fix udelay / __udelay confusion

PATCH New Wolfgang Denk 1 participant 1 message May 21, 2010 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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'

---
 arch/arm/cpu/arm920t/a320/timer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/cpu/arm920t/a320/timer.c +1 -1
index d69dbff..d2e316f 100644
@@ -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);
Signature · 1 line
1.6.6.1