Merge tag 'signed-efi-2018.07' of git://github.com/agraf/u-boot

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

diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c
index 574895155d1053cc9d87cb942b9d4821c60c98b2..87557e52c075393d335a0be0913a220fb8b370d2 100644 (file)
--- a/drivers/video/ati_radeon_fb.c
+++ b/drivers/video/ati_radeon_fb.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * ATI Radeon Video card Framebuffer driver.
  *
@@ -5,8 +6,6 @@
  * Zhang Wei <wei.zhang@freescale.com>
  * Jason Jin <jason.jin@freescale.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Some codes of this file is partly ported from Linux kernel
  * ATI video framebuffer driver.
  *
@@ -22,7 +21,7 @@
 #include <bios_emul.h>
 #include <pci.h>
 #include <asm/processor.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/io.h>
 #include <malloc.h>
 #include <video_fb.h>
@@ -637,7 +636,8 @@ void *video_hw_init(void)
 
        videomode = CONFIG_SYS_DEFAULT_VIDEO_MODE;
        /* get video mode via environment */
-       if ((penv = getenv ("videomode")) != NULL) {
+       penv = env_get("videomode");
+       if (penv) {
                /* deceide if it is a string */
                if (penv[0] <= '9') {
                        videomode = (int) simple_strtoul (penv, NULL, 16);