ARMV7: Vexpress: Fix build error
authorDirk Behme <dirk.behme@googlemail.com>
Mon, 29 Nov 2010 18:56:59 +0000 (19:56 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 8 Dec 2010 22:46:36 +0000 (23:46 +0100)
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>
board/armltd/vexpress/ca9x4_ct_vxp.c

index c1c4ea1c34d26aca7887547483efb8e0792b7b5a..ce1be1e7665c39b5ca6d9bbf607bc78ee820697a 100644 (file)
@@ -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;