Merge branch 'master' of ../master into next

[u-boot] / board / armltd / vexpress / ca9x4_ct_vxp.c

diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/ca9x4_ct_vxp.c
index c1c4ea1c34d26aca7887547483efb8e0792b7b5a..ce1be1e7665c39b5ca6d9bbf607bc78ee820697a 100644 (file)
--- 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;