[kernel] r6677 - in dists/sid/linux-2.6/debian: patches patches/series

[Martin Michlmayr]

Author: tbm
Date: Wed May 24 12:28:46 2006
New Revision: 6677

Added:
   dists/sid/linux-2.6/debian/patches/mips-maxine-compile.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/15

Log:
Add a compile fix for the Maxine fb.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed May 24 12:28:46 2006
@@ -9,6 +9,7 @@
 
   [ Martin Michlmayr ]
   * [mips/b1-bcm91250a] Enable SMP.
+  * [mips] Add a compile fix for the Maxine fb.
 
  -- maximilian attems <maks at sternwelten.at>  Wed, 24 May 2006 11:29:16 +0200
 

Added: dists/sid/linux-2.6/debian/patches/mips-maxine-compile.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/mips-maxine-compile.patch	Wed May 24 12:28:46 2006
@@ -0,0 +1,45 @@
+# Upstream status: approved by the fb sub-system maintainer.  I hope he'll
+# send it on to Linus or 2.6.17.
+
+Date: Tue, 9 May 2006 23:01:14 +0200
+From: Martin Michlmayr <tbm at cyrius.com>
+To: linux-fbdev-devel at lists.sourceforge.net
+Subject: [PATCH] Fix maxine compilation error
+
+[PATCH] Fix maxine compilation error
+
+Fix the following compilation error:
+
+  CC      drivers/video/maxinefb.o
+drivers/video/maxinefb.c:58: warning: initializer-string for array of chars is too long
+drivers/video/maxinefb.c:58: warning: (near initialization for ‘maxinefb_fix.id’)
+drivers/video/maxinefb.c:110: error: unknown field ‘fb_get_fix’ specified in initializer
+drivers/video/maxinefb.c:110: error: ‘gen_get_fix’ undeclared here (not in a function)
+drivers/video/maxinefb.c:111: error: unknown field ‘fb_get_var’ specified in initializer
+drivers/video/maxinefb.c:111: error: ‘gen_get_var’ undeclared here (not in a function)
+make[2]: *** [drivers/video/maxinefb.o] Error 1
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+
+
+--- drivers/video/maxinefb.c~	2006-05-09 20:50:36.000000000 +0000
++++ drivers/video/maxinefb.c	2006-05-09 20:57:27.000000000 +0000
+@@ -55,7 +55,7 @@
+ };
+ 
+ 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 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,
+

Modified: dists/sid/linux-2.6/debian/patches/series/15
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/15	(original)
+++ dists/sid/linux-2.6/debian/patches/series/15	Wed May 24 12:28:46 2006
@@ -1 +1,2 @@
 + 2.6.16.18
++ mips-maxine-compile.patch