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

• Lines: 72
• Date: Wed Jul 22 13:40:04 1998
• Orig file: v2.1.110/linux/drivers/video/retz3fb.c
• Orig date: Tue Jul 21 00:15:32 1998

diff -u --recursive --new-file v2.1.110/linux/drivers/video/retz3fb.c linux/drivers/video/retz3fb.c
@@ -21,7 +21,6 @@
  */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -290,7 +289,7 @@
  *    Text console acceleration
  */
 
-#ifdef CONFIG_FBCON_CFB8
+#ifdef FBCON_HAS_CFB8
 static struct display_switch fbcon_retz3_8;
 #endif
 
@@ -1280,7 +1279,7 @@
 	display->can_soft_blank = 1;
 	display->inverse = z3fb_inverse;
 	switch (display->var.bits_per_pixel) {
-#ifdef CONFIG_FBCON_CFB8
+#ifdef FBCON_HAS_CFB8
 	case 8:
 		if (display->var.accel_flags & FB_ACCELF_TEXT) {
 		    display->dispsw = &fbcon_retz3_8;
@@ -1289,7 +1288,7 @@
 		    display->dispsw = &fbcon_cfb8;
 		break;
 #endif
-#ifdef CONFIG_FBCON_CFB16
+#ifdef FBCON_HAS_CFB16
 	case 16:
 		display->dispsw = &fbcon_cfb16;
 		break;
@@ -1351,7 +1350,7 @@
 			display->can_soft_blank = 1;
 			display->inverse = z3fb_inverse;
 			switch (display->var.bits_per_pixel) {
-#ifdef CONFIG_FBCON_CFB8
+#ifdef FBCON_HAS_CFB8
 			case 8:
 				if (var->accel_flags & FB_ACCELF_TEXT) {
 					display->dispsw = &fbcon_retz3_8;
@@ -1360,7 +1359,7 @@
 					display->dispsw = &fbcon_cfb8;
 				break;
 #endif
-#ifdef CONFIG_FBCON_CFB16
+#ifdef FBCON_HAS_CFB16
 			case 16:
 				display->dispsw = &fbcon_cfb16;
 				break;
@@ -1629,7 +1628,7 @@
  *  Text console acceleration
  */
 
-#ifdef CONFIG_FBCON_CFB8
+#ifdef FBCON_HAS_CFB8
 static void fbcon_retz3_8_bmove(struct display *p, int sy, int sx, int dy, int dx,
 	                int height, int width)
 {
@@ -1676,7 +1675,7 @@
 
 static struct display_switch fbcon_retz3_8 = {
     fbcon_cfb8_setup, fbcon_retz3_8_bmove, fbcon_retz3_8_clear,
-    fbcon_cfb8_putc, fbcon_cfb8_putcs, fbcon_cfb8_revc, NULL,
-    NULL, FONTWIDTH(8)
+    fbcon_cfb8_putc, fbcon_cfb8_putcs, fbcon_cfb8_revc, NULL, NULL,
+    fbcon_cfb8_clear_margins, FONTWIDTH(8)
 };
 #endif