diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 12:37:17 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 12:37:17 +0000 |
| commit | 9aa9eb41942b918f385ccabd2efdd6e7e4232165 (patch) | |
| tree | 20bec7da036d31ec185dfc1dcc00753c7ac9b170 /drivers/video | |
| parent | 87075e049581f880f01eb0b41aa6ac807b299e35 (diff) | |
Merge with Linux 2.4.0-test6-pre1.
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 4b388f60b..f206bef56 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -857,7 +857,7 @@ static int rivafb_set_var (struct fb_var_screeninfo *var, int con, 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 @@ static int riva_setcolreg (unsigned regno, unsigned red, unsigned green, ((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 */ |