diff --git a/[refs] b/[refs]
index e90126d21b98..bd095e20fc17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11f11d522f74965fce421a5a09ff0ab178139d36
+refs/heads/master: ff388ad05bc67163124ac74126bbc16faa2fb771
diff --git a/trunk/drivers/video/s3fb.c b/trunk/drivers/video/s3fb.c
index 53f1eb9638ae..2a8d7d3338d5 100644
--- a/trunk/drivers/video/s3fb.c
+++ b/trunk/drivers/video/s3fb.c
@@ -183,7 +183,10 @@ static void s3fb_settile_fast(struct fb_info *info, struct fb_tilemap *map)
 	}
 }
 
-
+static int s3fb_get_tilemax(struct fb_info *info)
+{
+	return 256;
+}
 
 static struct fb_tile_ops s3fb_tile_ops = {
 	.fb_settile	= svga_settile,
@@ -191,6 +194,7 @@ static struct fb_tile_ops s3fb_tile_ops = {
 	.fb_tilefill    = svga_tilefill,
 	.fb_tileblit    = svga_tileblit,
 	.fb_tilecursor  = svga_tilecursor,
+	.fb_get_tilemax = s3fb_get_tilemax,
 };
 
 static struct fb_tile_ops s3fb_fast_tile_ops = {
@@ -199,6 +203,7 @@ static struct fb_tile_ops s3fb_fast_tile_ops = {
 	.fb_tilefill    = svga_tilefill,
 	.fb_tileblit    = svga_tileblit,
 	.fb_tilecursor  = svga_tilecursor,
+	.fb_get_tilemax = s3fb_get_tilemax,
 };