Merge branch 'master' into next

[u-boot] / lib_sh / time_sh2.c

diff --git a/lib_sh/time_sh2.c b/lib_sh/time_sh2.c
index 4f893c87bd90e311f2578e33dcd9521f3bd914b0..789b46f0e0261273cfb2545f34bfc3254a7be29c 100644 (file)
--- a/lib_sh/time_sh2.c
+++ b/lib_sh/time_sh2.c
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 
-#define CMT_CMCSR_INIT  0x0001 /* PCLK/32 */
+#define CMT_CMCSR_INIT 0x0001  /* PCLK/32 */
 #define CMT_CMCSR_CALIB 0x0000
 #define CMT_MAX_COUNTER (0xFFFFFFFF)
 #define CMT_TIMER_RESET (0xFFFF)
@@ -87,7 +87,7 @@ static unsigned long get_usec (void)
 /* return msec */
 ulong get_timer(ulong base)
 {
-       return (get_usec()/1000) - base;
+       return (get_usec() / 1000) - base;
 }
 
 void set_timer(ulong t)
@@ -103,7 +103,7 @@ void reset_timer(void)
        cmt_timer_start(0);
 }
 
-void udelay(unsigned long usec)
+void __udelay(unsigned long usec)
 {
        unsigned long end = get_usec() + usec;