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

[u-boot] / drivers / video / mx3fb.c

diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index 3f10d5c2d929b4e6233ad852d9e0c800f9e2835e..176ae70b7ceef299753506838e5f9a2a1e760134 100644 (file)
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2009
  * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
  * Copyright (C) 2011
  * HALE electronic GmbH, <helmut.raiger@hale.at>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <malloc.h>
@@ -12,7 +11,7 @@
 
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 
 #include "videomodes.h"
@@ -344,8 +343,6 @@ union chan_param_mem {
        struct chan_param_mem_interleaved       ip;
 };
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /* graphics setup */
 static GraphicDevice panel;
 static struct ctfb_res_modes *mode;
@@ -816,7 +813,7 @@ void *video_hw_init(void)
 
        videomode = CONFIG_SYS_DEFAULT_VIDEO_MODE;
        /* get video mode via environment */
-       penv = getenv("videomode");
+       penv = env_get("videomode");
        if (penv) {
                /* decide if it is a string */
                if (penv[0] <= '9') {