Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / video / fbcvt.c

diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c
index b5498999c4eccb6a57ec3dffc1e8c0860b4be5a9..0847c5e72cbd73ff2fcf53afe59c1d729810e2d9 100644 (file)
--- a/drivers/video/fbcvt.c
+++ b/drivers/video/fbcvt.c
@@ -57,7 +57,7 @@ struct fb_cvt_data {
        u32 status;
 };
 
-static int fb_cvt_vbi_tab[] = {
+static const unsigned char fb_cvt_vbi_tab[] = {
        4,        /* 4:3      */
        5,        /* 16:9     */
        6,        /* 16:10    */