From: Dirk Behme <dirk.behme@googlemail.com>
Date: Mon, 29 Nov 2010 18:56:59 +0000 (+0100)
Subject: ARMV7: Vexpress: Fix build error
X-Git-Tag: v2010.12-rc3~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=44b0a386bc435d2b51e1b088a0e2610226000c3c;p=oweals%2Fu-boot.git

ARMV7: Vexpress: Fix build error

Fix ca9x4_ct_vxp build error

Configuring for ca9x4_ct_vxp board...
board/armltd/vexpress/libvexpress.o: In function `udelay':
u-boot.git/board/armltd/vexpress/ca9x4_ct_vxp.c:161: multiple
definition of `udelay'
lib/libgeneric.o:u-boot.git/lib/time.c:34: first defined here

lib/libgeneric.o: In function `udelay':

zlib.c:(.text+0x1ee8): undefined reference to `__udelay'

Signed-of-by: Dirk Behme <dirk.behme@googlemail.com>
---

diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/ca9x4_ct_vxp.c
index c1c4ea1c34..ce1be1e766 100644
--- a/board/armltd/vexpress/ca9x4_ct_vxp.c
+++ b/board/armltd/vexpress/ca9x4_ct_vxp.c
@@ -157,7 +157,7 @@ void reset_cpu(ulong addr)
  * Delay x useconds AND perserve advance timstamp value
  *     assumes timer is ticking at 1 msec
  */
-void udelay(ulong usec)
+void __udelay(ulong usec)
 {
 	ulong tmo, tmp;