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

diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c
index b5bb8e0..93fdc68 100644 (file)
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -272,7 +272,7 @@ static int video_post_bind(struct udevice *dev)
        ulong size;
 
        /* Before relocation there is nothing to do here */
-       if ((!gd->flags & GD_FLG_RELOC))
+       if (!(gd->flags & GD_FLG_RELOC))
                return 0;
        size = alloc_fb(dev, &addr);
        if (addr < gd->video_bottom) {

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
old mode 100755 (executable)
new mode 100644 (file)