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

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

diff -u --recursive --new-file v2.1.110/linux/drivers/video/tgafb.c linux/drivers/video/tgafb.c
@@ -22,7 +22,6 @@
  * KNOWN PROBLEMS/TO DO ==================================================== */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
@@ -741,22 +740,21 @@
     disp.can_soft_blank = 1;
     disp.inverse = 0;
     switch (tga_type) {
-#ifdef CONFIG_FBCON_CFB8
+#ifdef FBCON_HAS_CFB8
 	case 0: /* 8-plane */
 	    disp.dispsw = &fbcon_cfb8;
-	    disp.scrollmode = SCROLL_YREDRAW;
 	    break;
 #endif
-#ifdef CONFIG_FBCON_CFB32
+#ifdef FBCON_HAS_CFB32
 	case 1: /* 24-plane */
 	case 3: /* 24plusZ */
 	    disp.dispsw = &fbcon_cfb32;
-	    disp.scrollmode = SCROLL_YREDRAW;
 	    break;
 #endif
 	default:
 	    disp.dispsw = NULL;
     }
+    disp.scrollmode = SCROLL_YREDRAW;
 
     strcpy(fb_info.modename, fb_fix.id);
     fb_info.node = -1;
@@ -842,10 +840,10 @@
     palette[regno].green = green;
     palette[regno].blue = blue;
 
-#ifdef CONFIG_FBCON_CFB32
+#ifdef FBCON_HAS_CFB32
     if (regno < 16 && tga_type != 0)
 	fbcon_cfb32_cmap[regno] = (red << 16) | (green << 8) | blue;
-#endif /* CONFIG_FBCON_CFB32 */
+#endif
 
     /* How to set a single color register?? */