Merge with /home/hs/jupiter/u-boot

[oweals/u-boot.git] / board / xilinx / ml300 / serial.c

diff --git a/board/xilinx/ml300/serial.c b/board/xilinx/ml300/serial.c
index 19bcc6ff33400f284ed56fd367fd9c37de694319..9b03f89eff44e2f56c0f39775a3da2956534ce7e 100644 (file)
--- a/board/xilinx/ml300/serial.c
+++ b/board/xilinx/ml300/serial.c
@@ -40,8 +40,9 @@
 #include <asm/processor.h>
 #include <common.h>
 #include <command.h>
-#include <configs/ml300.h>
-#include "xparameters.h"
+#include <config.h>
+
+DECLARE_GLOBAL_DATA_PTR;
 
 #define USE_CHAN1 \
        ((defined XPAR_UARTNS550_0_BASEADDR) && (defined CFG_INIT_CHAN1))
@@ -64,7 +65,6 @@ int
 serial_init(void)
 {
 #if USE_CHAN1
-       DECLARE_GLOBAL_DATA_PTR;
        int clock_divisor;
 
        clock_divisor = XPAR_UARTNS550_0_CLOCK_FREQ_HZ / 16 / gd->baudrate;
@@ -103,7 +103,6 @@ void
 serial_setbrg(void)
 {
 #if USE_CHAN1
-       DECLARE_GLOBAL_DATA_PTR;
        int clock_divisor;
 
        clock_divisor = XPAR_UARTNS550_0_CLOCK_FREQ_HZ / 16 / gd->baudrate;