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

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

diff -u --recursive --new-file v2.1.110/linux/drivers/video/vesafb.c linux/drivers/video/vesafb.c
@@ -8,7 +8,6 @@
  *
  */ 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -171,18 +170,18 @@
 	vesafb_get_var(&display->var, -1, &fb_info);
 
 	switch (video_bpp) {
-#ifdef CONFIG_FBCON_CFB8
+#ifdef FBCON_HAS_CFB8
 	case 8:
 		sw = &fbcon_cfb8;
 		break;
 #endif
-#ifdef CONFIG_FBCON_CFB16
+#ifdef FBCON_HAS_CFB16
 	case 15:
 	case 16:
 		sw = &fbcon_cfb16;
 		break;
 #endif
-#ifdef CONFIG_FBCON_CFB32
+#ifdef FBCON_HAS_CFB32
 	case 32:
 		sw = &fbcon_cfb32;
 		break;
@@ -242,7 +241,7 @@
 	palette[regno].blue  = blue;
 	
 	switch (video_bpp) {
-#ifdef CONFIG_FBCON_CFB8
+#ifdef FBCON_HAS_CFB8
 	case 8:
 		/* Hmm, can we do it _always_ this way ??? */
 		outb_p(regno, dac_reg);
@@ -251,19 +250,19 @@
 		outb_p(blue, dac_val);
 		break;
 #endif
-#ifdef CONFIG_FBCON_CFB16
+#ifdef FBCON_HAS_CFB16
 	case 15:
 	case 16:
 		fbcon_cfb16_cmap[regno] =
 			(red << vesafb_defined.red.offset) | (green << 5) | blue;
 		break;
 #endif
-#ifdef CONFIG_FBCON_CFB24
+#ifdef FBCON_HAS_CFB24
 	case 24:
 		/* FIXME: todo */
 		break;
 #endif
-#ifdef CONFIG_FBCON_CFB32
+#ifdef FBCON_HAS_CFB32
 	case 32:
 		fbcon_cfb32_cmap[regno] =
 			(red   << vesafb_defined.red.offset)   |