diff --git a/[refs] b/[refs]
index 26fb1d9a616e..b7dc59ba28c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c05b7f3d12b9455d746b69b7078ed34d777f560b
+refs/heads/master: 8fd66ab852281f9e28e1774c17b49f26c4626fd1
diff --git a/trunk/drivers/video/maxinefb.c b/trunk/drivers/video/maxinefb.c
index 743e7ad26acc..f85421bf7cb5 100644
--- a/trunk/drivers/video/maxinefb.c
+++ b/trunk/drivers/video/maxinefb.c
@@ -55,7 +55,7 @@ static struct fb_var_screeninfo maxinefb_defined = {
 };
 
 static struct fb_fix_screeninfo maxinefb_fix = {
-	.id =		"Maxine onboard graphics 1024x768x8",
+	.id =		"Maxine",
 	.smem_len =	(1024*768),
 	.type =		FB_TYPE_PACKED_PIXELS,
 	.visual =	FB_VISUAL_PSEUDOCOLOR,
@@ -107,8 +107,6 @@ static int maxinefb_setcolreg(unsigned regno, unsigned red, unsigned green,
 
 static struct fb_ops maxinefb_ops = {
 	.owner		= THIS_MODULE,
-	.fb_get_fix	= gen_get_fix,
-	.fb_get_var	= gen_get_var,
 	.fb_setcolreg	= maxinefb_setcolreg,
 	.fb_fillrect	= cfb_fillrect,
 	.fb_copyarea	= cfb_copyarea,