Merge with /home/wd/git/u-boot/master

[oweals/u-boot.git] / drivers / serial_max3100.c

diff --git a/drivers/serial_max3100.c b/drivers/serial_max3100.c
index bbe212b81f79e3e2e6f465087e0d46aa7388cbb9..35c5596985bbf6ee05cf01f0c1ba4bb734c22531 100644 (file)
--- a/drivers/serial_max3100.c
+++ b/drivers/serial_max3100.c
@@ -28,6 +28,8 @@
 
 #ifdef CONFIG_MAX3100_SERIAL
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /**************************************************************/
 
 /* convienient macros */
@@ -217,7 +219,6 @@ int serial_init(void)
 {
        unsigned int wconf, rconf;
        int i;
-       DECLARE_GLOBAL_DATA_PTR;
 
        wconf = 0;