summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorDirk Behme <dirk.behme@googlemail.com>2010-11-29 19:56:59 +0100
committerWolfgang Denk <wd@denx.de>2010-12-08 23:46:36 +0100
commit44b0a386bc435d2b51e1b088a0e2610226000c3c (patch)
tree4172a0b9364da3735b5f96e8ce4b32f650d5086e /board
parent9d37cf310af1b9a6583396c98255fc86f9aab433 (diff)
downloadu-boot-imx-44b0a386bc435d2b51e1b088a0e2610226000c3c.zip
u-boot-imx-44b0a386bc435d2b51e1b088a0e2610226000c3c.tar.gz
u-boot-imx-44b0a386bc435d2b51e1b088a0e2610226000c3c.tar.bz2
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>
Diffstat (limited to 'board')
-rw-r--r--board/armltd/vexpress/ca9x4_ct_vxp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/ca9x4_ct_vxp.c
index c1c4ea1..ce1be1e 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;