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

[oweals/u-boot.git] / cpu / arm720t / serial.c

diff --git a/cpu/arm720t/serial.c b/cpu/arm720t/serial.c
index 15c54af08b789caa97fd2077aaadc325322c8c6f..54a9b3137bd2c8ef2160e7fb1d479966116970bc 100644 (file)
--- a/cpu/arm720t/serial.c
+++ b/cpu/arm720t/serial.c
@@ -85,7 +85,7 @@ void serial_putc (const char c)
        if (c == '\n')
                serial_putc ('\r');
 
-       tmo = get_timer (0) + 1 * CFG_HZ;
+       tmo = get_timer (0) + 1 * CONFIG_SYS_HZ;
        while (IO_SYSFLG1 & SYSFLG1_UTXFF)
                if (get_timer (0) > tmo)
                        break;
@@ -125,12 +125,12 @@ serial_puts (const char *s)
 
 #elif defined(CONFIG_LPC2292)
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #include <asm/arch/hardware.h>
 
 void serial_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        unsigned short divisor = 0;
 
        switch (gd->baudrate) {