diff --git a/[refs] b/[refs] index 3e9140cd1216..e90126d21b98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8db51668f5ef6ae31ed4e4f0c6e2976a190dfa11 +refs/heads/master: 11f11d522f74965fce421a5a09ff0ab178139d36 diff --git a/trunk/include/linux/fb.h b/trunk/include/linux/fb.h index 619ba1e40ab9..a2f382c01cd2 100644 --- a/trunk/include/linux/fb.h +++ b/trunk/include/linux/fb.h @@ -655,7 +655,6 @@ struct fb_ops { }; #ifdef CONFIG_FB_TILEBLITTING - #define FB_TILE_CURSOR_NONE 0 #define FB_TILE_CURSOR_UNDERLINE 1 #define FB_TILE_CURSOR_LOWER_THIRD 2 @@ -727,6 +726,8 @@ struct fb_tile_ops { /* cursor */ void (*fb_tilecursor)(struct fb_info *info, struct fb_tilecursor *cursor); + /* get maximum length of the tile map */ + int (*fb_get_tilemax)(struct fb_info *info); }; #endif /* CONFIG_FB_TILEBLITTING */