patch-2.1.111 linux/drivers/video/chipsfb.c

• Lines: 41
• Date: Tue Jul 21 10:28:24 1998
• Orig file: v2.1.110/linux/drivers/video/chipsfb.c
• Orig date: Tue Jul 21 00:15:32 1998

diff -u --recursive --new-file v2.1.110/linux/drivers/video/chipsfb.c linux/drivers/video/chipsfb.c
@@ -41,6 +41,7 @@
 #include "fbcon.h"
 #include "fbcon-cfb8.h"
 #include "fbcon-cfb16.h"
+#include "macmodes.h"
 
 static int currcon = 0;
 
@@ -300,7 +301,7 @@
 	out_8(p->io_base + 0x3c9, green);
 	out_8(p->io_base + 0x3c9, blue);
 
-#ifdef CONFIG_FBCON_CFB16
+#ifdef FBCON_HAS_CFB16
     if (regno < 16)
 		fbcon_cfb16_cmap[regno] = (red << 10) | (green << 5) | blue;		
 #endif
@@ -347,7 +348,11 @@
 		var->blue.offset = 0;
 		var->red.length = var->green.length = var->blue.length = 5;
 		
+#ifdef FBCON_HAS_CFB16
 		disp->dispsw = &fbcon_cfb16;
+#else
+		disp->dispsw = NULL;
+#endif
     } else if (bpp == 8) {
 		if (con == currcon) {
 			write_cr(0x13, 100);		// 8 bit display width (decimal)
@@ -362,7 +367,11 @@
  		var->red.offset = var->green.offset = var->blue.offset = 0;
 		var->red.length = var->green.length = var->blue.length = 8;
 		
+#ifdef FBCON_HAS_CFB8
 		disp->dispsw = &fbcon_cfb8;
+#else
+		disp->dispsw = NULL;
+#endif
 	}
 
 	var->bits_per_pixel = bpp;