Merge git://git.denx.de/u-boot-dm

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

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 20455ffb54219e9965bbd989c0e601d1392d50ae..9d810bab31dee19a24241f9f75f78ad3e8686c07 100644 (file)
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -15,7 +15,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 
-#include <asm/imx-common/dma.h>
+#include <asm/mach-imx/dma.h>
 
 #include "videomodes.h"
 
@@ -161,7 +161,7 @@ void *video_hw_init(void)
        puts("Video: ");
 
        /* Suck display configuration from "videomode" variable */
-       penv = getenv("videomode");
+       penv = env_get("videomode");
        if (!penv) {
                puts("MXSFB: 'videomode' variable not set!\n");
                return NULL;