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

• Lines: 30
• Date: Tue Jul 21 10:28:24 1998
• Orig file: v2.1.110/linux/drivers/video/amifb.c
• Orig date: Thu Jul 16 18:09:27 1998

diff -u --recursive --new-file v2.1.110/linux/drivers/video/amifb.c linux/drivers/video/amifb.c
@@ -1486,17 +1486,17 @@
 			display->can_soft_blank = 1;
 			display->inverse = amifb_inverse;
 			switch (fix.type) {
-#ifdef CONFIG_FBCON_ILBM
+#ifdef FBCON_HAS_ILBM
 			    case FB_TYPE_INTERLEAVED_PLANES:
 				display->dispsw = &fbcon_ilbm;
 				break;
 #endif
-#ifdef CONFIG_FBCON_AFB
+#ifdef FBCON_HAS_AFB
 			    case FB_TYPE_PLANES:
 				display->dispsw = &fbcon_afb;
 				break;
 #endif
-#ifdef CONFIG_FBCON_MFB
+#ifdef FBCON_HAS_MFB
 			    case FB_TYPE_PACKED_PIXELS:	/* depth == 1 */
 				display->dispsw = &fbcon_mfb;
 				break;
@@ -2129,7 +2129,7 @@
 	fix->smem_start = (char *)videomemory;
 	fix->smem_len = videomemorysize;
 
-#ifdef CONFIG_FBCON_MFB
+#ifdef FBCON_HAS_MFB
 	if (par->bpp == 1) {
 		fix->type = FB_TYPE_PACKED_PIXELS;
 		fix->type_aux = 0;