Merge master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / drivers / video / fbcvt.c

diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c
index b5498999c4eccb6a57ec3dffc1e8c0860b4be5a9..7293eaccd81bd4b5846c187f848cb30ccb32d735 100644 (file)
--- a/drivers/video/fbcvt.c
+++ b/drivers/video/fbcvt.c
@@ -13,6 +13,7 @@
  *
  */
 #include <linux/fb.h>
+#include <linux/slab.h>
 
 #define FB_CVT_CELLSIZE               8
 #define FB_CVT_GTF_C                 40
@@ -57,7 +58,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    */