diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /drivers/video/igafb.c | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'drivers/video/igafb.c')
| -rw-r--r-- | drivers/video/igafb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c index b9b1a1aed..5ce2f2648 100644 --- a/drivers/video/igafb.c +++ b/drivers/video/igafb.c @@ -356,7 +356,7 @@ static int iga_setcolreg(unsigned regno, unsigned red, unsigned green, pci_outb(info, green, DAC_DATA); pci_outb(info, blue, DAC_DATA); - if (regno < 16) + if (regno < 16) { switch (default_var.bits_per_pixel) { #ifdef FBCON_HAS_CFB16 case 16: @@ -372,11 +372,14 @@ static int iga_setcolreg(unsigned regno, unsigned red, unsigned green, #endif #ifdef FBCON_HAS_CFB32 case 32: + { int i; i = (regno << 8) | regno; info->fbcon_cmap.cfb32[regno] = (i << 16) | i; + } break; #endif } + } return 0; } @@ -510,6 +513,8 @@ static void igafb_set_disp(int con, struct fb_info_iga *info) break; #endif default: + printk(KERN_WARNING "igafb_set_disp: unknown resolution %d\n", + default_var.bits_per_pixel); return; } memcpy(&info->dispsw, sw, sizeof(*sw)); |