Merge branch 'master' into next

[u-boot] / cpu / arm926ejs / omap / timer.c

diff --git a/cpu/arm926ejs/omap/timer.c b/cpu/arm926ejs/omap/timer.c
index 392b158d508eb30c3dddb817ad80e10ee304d135..2ac38c40b774e9f22a5b69c823873a9439cd4603 100644 (file)
--- a/cpu/arm926ejs/omap/timer.c
+++ b/cpu/arm926ejs/omap/timer.c
@@ -80,7 +80,7 @@ void set_timer (ulong t)
 }
 
 /* delay x useconds AND perserve advance timstamp value */
-void udelay (unsigned long usec)
+void __udelay (unsigned long usec)
 {
        ulong tmo, tmp;