patch-2.1.124 linux/drivers/video/macfb.c

• Lines: 52
• Date: Thu Oct 1 10:02:22 1998
• Orig file: v2.1.123/linux/drivers/video/macfb.c
• Orig date: Mon Aug 3 12:45:46 1998

diff -u --recursive --new-file v2.1.123/linux/drivers/video/macfb.c linux/drivers/video/macfb.c
@@ -22,12 +22,11 @@
 #include <asm/macintosh.h>
 #include <linux/fb.h>
 
-
 /* conditionalize these ?? */
-#include "fbcon-mfb.h"
-#include "fbcon-cfb2.h"
-#include "fbcon-cfb4.h"
-#include "fbcon-cfb8.h"
+#include <video/fbcon-mfb.h>
+#include <video/fbcon-cfb2.h>
+#include <video/fbcon-cfb4.h>
+#include <video/fbcon-cfb8.h>
 
 #define arraysize(x)    (sizeof(x)/sizeof(*(x)))
 
@@ -237,7 +236,7 @@
 		break;
 #endif
 	    default:
-		display->dispsw = NULL;
+		display->dispsw = &fbcon_dummy;
 		break;
 	}
 }
@@ -261,7 +260,7 @@
 	if (console_loglevel < 7)
 		return -EINVAL;
 	if (con == currcon) /* current console? */
-		return fb_get_cmap(cmap, &fb_display[con].var, kspc, 0 /*offb_getcolreg*/, info);
+		return fb_get_cmap(cmap, kspc, 0 /*offb_getcolreg*/, info);
 	else if (fb_display[con].cmap.len) /* non default colormap? */
 		fb_copy_cmap(&fb_display[con].cmap, cmap, kspc ? 0 : 2);
 	else
@@ -285,7 +284,7 @@
 		return err;
 	}
 	if (con == currcon)			/* current console? */
-		return fb_set_cmap(cmap, &fb_display[con].var, kspc, 1 /*offb_setcolreg*/, info);
+		return fb_set_cmap(cmap, kspc, 1 /*offb_setcolreg*/, info);
 	else
 		fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
 #endif
@@ -415,6 +414,7 @@
 	fb_info.switch_con=&macfb_switch;
 	fb_info.updatevar=&fb_update_var;
 	fb_info.blank=&macfb_blank;
+	fb_info.flags = FBINFO_FLAG_DEFAULT;
 	do_fb_set_var(&macfb_defined,1);
 
 	macfb_get_var(&disp.var, -1, &fb_info);