Merge branch 'master' into next

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

diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
index b3b53e12bc327c17448d180d850fdbe8755324ff..7726bb3193c06e2f8304eda52ac896ff9e3f4829 100644 (file)
--- a/drivers/video/bus_vcxk.c
+++ b/drivers/video/bus_vcxk.c
@@ -380,7 +380,6 @@ int vcxk_display_bitmap(ulong addr, int x, int y)
        unsigned long c_width;
        unsigned long c_height;
        unsigned char *dataptr;
-       unsigned char *lineptr;
 
        bmp = (bmp_image_t *) addr;
        if ((bmp->header.signature[0] == 'B') &&