Merge branch 'master'

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 82e39cd0c4fb..c698055266d0 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -619,7 +619,7 @@ struct fb_tilemap {
         __u32 height;               /* height of each tile in scanlines */
         __u32 depth;                /* color depth of each tile */
         __u32 length;               /* number of tiles in the map */
-        __u8  *data;                /* actual tile map: a bitmap array, packed
+        const __u8 *data;           /* actual tile map: a bitmap array, packed
                                        to the nearest byte */
 };