Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

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

diff --git a/cpu/s3c44b0/serial.c b/cpu/s3c44b0/serial.c
index 61ccfc7a2b4312711ca261ee2b4bbedea8bd0ec7..95d0266c6c675cba1a31f98e8c007d9cae21fa37 100644 (file)
--- a/cpu/s3c44b0/serial.c
+++ b/cpu/s3c44b0/serial.c
@@ -37,6 +37,8 @@
 #include <common.h>
 #include <asm/hardware.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* flush serial input queue. returns 0 on success or negative error
  * number otherwise
  */
@@ -68,8 +70,6 @@ static int serial_flush_output(void)
 
 void serial_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        u32 divisor = 0;
 
        /* get correct divisor */
@@ -112,7 +112,7 @@ void serial_setbrg (void)
                divisor = 121;
 #else
 # error CONFIG_S3C44B0_CLOCK_SPEED undefined
-#endif         break;
+#endif /* break; */
 
        case 57600:
 #if CONFIG_S3C44B0_CLOCK_SPEED==66
@@ -121,7 +121,7 @@ void serial_setbrg (void)
                divisor = 80;
 #else
 # error CONFIG_S3C44B0_CLOCK_SPEED undefined
-#endif         break;
+#endif /* break; */
 
        case 115200:
 #if CONFIG_S3C44B0_CLOCK_SPEED==66
@@ -130,7 +130,7 @@ void serial_setbrg (void)
                divisor = 40;
 #else
 # error CONFIG_S3C44B0_CLOCK_SPEED undefined
-#endif         break;
+#endif /* break; */
        }
 
        serial_flush_output();