Merge with /home/tmlind/src/kernel/linux-2.6

[linux-2.6-omap-h63xx.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 9879ced596f4b3cea0a8b49c185e7f6cc65868a8..01f5212ade73d27c47090d2c6c04f1d828b0b4b2 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -620,7 +620,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 */
 };