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

[u-boot] / arch / arm / cpu / arm926ejs / versatile / timer.c

diff --git a/arch/arm/cpu/arm926ejs/versatile/timer.c b/arch/arm/cpu/arm926ejs/versatile/timer.c
index 563db3654867c6fdd7d71873b83063e6addffa52..81d67490db87cadb9bba2d7bd63d9bcb91048ea7 100644 (file)
--- a/arch/arm/cpu/arm926ejs/versatile/timer.c
+++ b/arch/arm/cpu/arm926ejs/versatile/timer.c
@@ -108,14 +108,14 @@ void set_timer (ulong t)
        timestamp = t;
 }
 
-/* delay x useconds AND perserve advance timstamp value */
+/* delay x useconds AND preserve advance timestamp value */
 void __udelay (unsigned long usec)
 {
        ulong tmo, tmp;
 
        if(usec >= 1000){               /* if "big" number, spread normalization to seconds */
                tmo = usec / 1000;      /* start to normalize for usec to ticks per sec */
-               tmo *= CONFIG_SYS_HZ;           /* find number of "ticks" to wait to achieve target */
+               tmo *= CONFIG_SYS_HZ;   /* find number of "ticks" to wait to achieve target */
                tmo /= 1000;            /* finish normalize. */
        }else{                          /* else small number, don't kill it prior to HZ multiply */
                tmo = usec * CONFIG_SYS_HZ;