Re: Patch to make current cvs (20010831) compile again for DECstations

Re: Patch to make current cvs (20010831) compile again for DECstations

[Paul Mundt]

[-- Attachment #1.1: Type: text/plain, Size: 321 bytes --]

On Fri, Aug 31, 2001 at 08:20:10PM +0200, Karsten Merker wrote:
[snip]
> +
> +void __init maxinefb_setup(char *options, int *ints)
> +{
> +}
> +
>  
[snip]

Since this isn't being used at all, why not just remove it from fbmem.c?

Regards,

-- 
Paul Mundt <pmundt@mvista.com>
MontaVista Software, Inc.


[-- Attachment #1.2: maxinefb-nosetup.diff --]
[-- Type: text/plain, Size: 735 bytes --]

Index: fbmem.c
===================================================================
RCS file: /cvs/linux/drivers/video/fbmem.c,v
retrieving revision 1.42
diff -u -r1.42 fbmem.c
--- fbmem.c	2001/08/23 22:24:43	1.42
+++ fbmem.c	2001/08/31 18:30:09
@@ -123,7 +123,6 @@
 extern int pmagbbfb_init(void);
 extern int pmagbbfb_setup(char *options, int *ints);
 extern void maxinefb_init(void);
-extern void maxinefb_setup(char *options, int *ints);
 extern int tx3912fb_init(void);
 extern int radeonfb_init(void);
 extern int radeonfb_setup(char*);
@@ -309,7 +308,7 @@
 #endif
 
 #ifdef CONFIG_FB_MAXINE
-        { "maxinefb", maxinefb_init, maxinefb_setup },
+        { "maxinefb", maxinefb_init, NULL },
 #endif
 
 

[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]

Patch to make current cvs (20010831) compile again for DECstations

[Karsten Merker]

[-- Attachment #1: Type: text/plain, Size: 620 bytes --]

Hallo everybody,

the current Linux/MIPS cvs at oss.sgi.com is broken with respect to 
DECstations. The framebuffer drivers and the dz driver do not compile
anymore. I have attached a small patch to get a compileable kernel
again (the dz part compiles but I could not test it - I currently
have no machine with dz serial available for testing). 
Harald, could you apply the patch to the cvs?

Greetings,
Karsten 
-- 
#include <standard_disclaimer>
Nach Paragraph 28 Abs. 3 Bundesdatenschutzgesetz widerspreche ich der Nutzung
oder Uebermittlung meiner Daten fuer Werbezwecke oder fuer die Markt- oder
Meinungsforschung.

[-- Attachment #2: fb+dz-against-cvs20010831.diff --]
[-- Type: text/plain, Size: 2698 bytes --]

diff -Nur linux.orig/drivers/char/dz.c linux/drivers/char/dz.c
--- linux.orig/drivers/char/dz.c	Fri Aug 31 19:58:05 2001
+++ linux/drivers/char/dz.c	Fri Aug 31 20:09:47 2001
@@ -1320,7 +1320,7 @@
 
 int __init dz_init(void)
 {
-	int i, flags, tmp;
+	int i, tmp;
 	long flags;
 	struct dz_serial *info;
 
diff -Nur linux.orig/drivers/char/dz.h linux/drivers/char/dz.h
--- linux.orig/drivers/char/dz.h	Fri Aug 31 19:58:05 2001
+++ linux/drivers/char/dz.h	Fri Aug 31 20:08:47 2001
@@ -10,6 +10,8 @@
 #ifndef DZ_SERIAL_H
 #define DZ_SERIAL_H
 
+#define SERIAL_MAGIC 0x5301
+
 /*
  * Definitions for the Control and Status Received.
  */
diff -Nur linux.orig/drivers/video/maxinefb.c linux/drivers/video/maxinefb.c
--- linux.orig/drivers/video/maxinefb.c	Fri Aug 31 19:59:10 2001
+++ linux/drivers/video/maxinefb.c	Fri Aug 31 20:08:47 2001
@@ -79,7 +79,7 @@
 };
 
 static int currcon = 0;
-struct maxinefb_par current_par;
+struct maxinefb_par maxinefb_current_par;
 
 /* Reference to machine type set in arch/mips/dec/prom/identify.c, KM */
 extern unsigned long mips_machtype;
@@ -145,7 +145,7 @@
 
 static void maxinefb_get_par(struct maxinefb_par *par)
 {
-	*par = current_par;
+	*par = maxinefb_current_par;
 }
 
 static int maxinefb_fb_update_var(int con, struct fb_info *info)
@@ -375,6 +375,11 @@
 
 	return 0;
 }
+
+void __init maxinefb_setup(char *options, int *ints)
+{
+}
+
 
 static void __exit maxinefb_exit(void)
 {
diff -Nur linux.orig/drivers/video/pmag-ba-fb.c linux/drivers/video/pmag-ba-fb.c
--- linux.orig/drivers/video/pmag-ba-fb.c	Fri Aug 31 19:59:11 2001
+++ linux/drivers/video/pmag-ba-fb.c	Fri Aug 31 20:08:47 2001
@@ -91,7 +91,7 @@
 };
 
 static int currcon = 0;
-struct pmagbafb_par current_par;
+struct pmagbafb_par pmagbafb_current_par;
 
 static void pmagbafb_encode_var(struct fb_var_screeninfo *var,
 				struct pmagbafb_par *par)
@@ -127,7 +127,7 @@
 
 static void pmagbafb_get_par(struct pmagbafb_par *par)
 {
-	*par = current_par;
+	*par = pmagbafb_current_par;
 }
 
 static int pmagba_fb_update_var(int con, struct fb_info *info)
diff -Nur linux.orig/drivers/video/pmagb-b-fb.c linux/drivers/video/pmagb-b-fb.c
--- linux.orig/drivers/video/pmagb-b-fb.c	Fri Aug 31 19:59:11 2001
+++ linux/drivers/video/pmagb-b-fb.c	Fri Aug 31 20:08:47 2001
@@ -94,7 +94,7 @@
 };
 
 static int currcon = 0;
-struct pmagbbfb_par current_par;
+struct pmagbbfb_par pmagbbfb_current_par;
 
 static void pmagbbfb_encode_var(struct fb_var_screeninfo *var,
 				struct pmagbbfb_par *par)
@@ -130,7 +130,7 @@
 
 static void pmagbbfb_get_par(struct pmagbbfb_par *par)
 {
-	*par = current_par;
+	*par = pmagbbfb_current_par;
 }
 
 static int pmagbb_fb_update_var(int con, struct fb_info *info)