Merge branch 'master' of git://git.denx.de/u-boot-arm

[people/ms/u-boot.git] / cpu / arm926ejs / nomadik / timer.c

diff --git a/cpu/arm926ejs/nomadik/timer.c b/cpu/arm926ejs/nomadik/timer.c
index 16067c900ae25f41b2fe486590c597f8ecdb2258..047b9e35130a014922200063d385def309f9244c 100644 (file)
--- a/cpu/arm926ejs/nomadik/timer.c
+++ b/cpu/arm926ejs/nomadik/timer.c
@@ -59,7 +59,7 @@ ulong get_timer(ulong base)
 }
 
 /* Delay x useconds */
-void udelay(unsigned long usec)
+void __udelay(unsigned long usec)
 {
        ulong ini, end;