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

[u-boot] / board / esd / cpci750 / serial.c

diff --git a/board/esd/cpci750/serial.c b/board/esd/cpci750/serial.c
index 44de052566774f6c63fda8a798384a9215e660c8..e1af37e1d8ac2ff49b9aff5994835ad01920ae05 100644 (file)
--- a/board/esd/cpci750/serial.c
+++ b/board/esd/cpci750/serial.c
@@ -38,13 +38,12 @@
 #include "../../Marvell/include/memory.h"
 #include "serial.h"
 
-
 #include "mpsc.h"
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int serial_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        mpsc_init (gd->baudrate);
 
        return (0);
@@ -70,8 +69,6 @@ int serial_tstc (void)
 
 void serial_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        galbrg_set_baudrate (CONFIG_MPSC_PORT, gd->baudrate);
 }
 
@@ -83,7 +80,7 @@ void serial_puts (const char *s)
        }
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 void kgdb_serial_init (void)
 {
 }
@@ -107,4 +104,4 @@ void kgdb_interruptible (int yes)
 {
        return;
 }
-#endif /* CFG_CMD_KGDB */
+#endif