patch-2.4.10 linux/drivers/video/riva/fbdev.c

• Lines: 26
• Date: Fri Sep 7 09:28:38 2001
• Orig file: v2.4.9/linux/drivers/video/riva/fbdev.c
• Orig date: Wed Jul 25 17:10:24 2001

diff -u --recursive --new-file v2.4.9/linux/drivers/video/riva/fbdev.c linux/drivers/video/riva/fbdev.c
@@ -260,7 +260,7 @@
 #endif
 
 #ifndef MODULE
-static const char *mode_option __initdata = NULL;
+static char *mode_option __initdata = NULL;
 #else
 static char *font = NULL;
 #endif
@@ -1109,6 +1109,8 @@
 		break;
 #endif
 #ifdef FBCON_HAS_CFB16
+	case 15:
+		rc = 15;	/* fix for 15 bpp depths on Riva 128 based cards */
 	case 16:
 		rc = 16;	/* directcolor... 16 entries SW palette */
 		break;		/* Mystique: truecolor, 16 entries SW palette, HW palette hardwired into 1:1 mapping */
@@ -1119,7 +1121,6 @@
 		break;		/* Mystique: truecolor, 16 entries SW palette, HW palette hardwired into 1:1 mapping */
 #endif
 	default:
-		assert(0);
 		/* should not occur */
 		break;
 	}