--- linux.orig/drivers/video/riva/fbdev.c	Fri Jun 30 01:15:35 2000
+++ linux/drivers/video/riva/fbdev.c	Fri Jun 30 01:17:01 2000
@@ -857,7 +857,7 @@
 		v.blue.offset = 0;
 #endif
 		v.red.length = 5;
-		v.green.length = 5;
+		v.green.length = 6;
 		v.blue.length = 5;
 		break;
 #endif
@@ -1390,8 +1390,8 @@
 		    ((green & 0xf800) << 2) | ((blue & 0xf800) >> 3);
 #else
 		rivainfo->con_cmap.cfb16[regno] =
-		    ((red & 0xf800) >> 1) |
-		    ((green & 0xf800) >> 6) | ((blue & 0xf800) >> 11);
+		    ((red & 0xf800) >> 0) |
+		    ((green & 0xf800) >> 5) | ((blue & 0xf800) >> 11);
 #endif
 		break;
 #endif				/* FBCON_HAS_CFB16 */