Merge branch 'next' of ../next

[platform/kernel/u-boot.git] / lib_microblaze / time.c

diff --git a/lib_microblaze/time.c b/lib_microblaze/time.c
index b5d8f19..da016a0 100644 (file)
--- a/lib_microblaze/time.c
+++ b/lib_microblaze/time.c
@@ -26,15 +26,15 @@
 
 #include <common.h>
 
-#ifdef CFG_TIMER_0
-void udelay (unsigned long usec)
+#ifdef CONFIG_SYS_TIMER_0
+void __udelay (unsigned long usec)
 {
        int i;
        i = get_timer (0);
        while ((get_timer (0) - i) < (usec / 1000)) ;
 }
 #else
-void udelay (unsigned long usec)
+void __udelay (unsigned long usec)
 {
        unsigned int i;
        for (i = 0; i < (usec * CONFIG_XILINX_CLOCK_FREQ / 10000000); i++);