Commit be974925 authored by Linus Torvalds's avatar Linus Torvalds

Fix tridentfd for 'name' move, and avoid compile warnings

parent d4a48a38
...@@ -454,9 +454,10 @@ static struct accel_switch accel_image = { ...@@ -454,9 +454,10 @@ static struct accel_switch accel_image = {
static void tridentfb_fillrect(struct fb_info * info, const struct fb_fillrect *fr) static void tridentfb_fillrect(struct fb_info * info, const struct fb_fillrect *fr)
{ {
int bpp = info->var.bits_per_pixel; int bpp = info->var.bits_per_pixel;
int dx,dy,w,h,col; int col;
switch (bpp) { switch (bpp) {
default:
case 8: col = fr->color; case 8: col = fr->color;
break; break;
case 16: col = ((u16 *)(info->pseudo_palette))[fr->color]; case 16: col = ((u16 *)(info->pseudo_palette))[fr->color];
...@@ -1129,7 +1130,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de ...@@ -1129,7 +1130,7 @@ static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
return -1; return -1;
} }
output("%s board found\n", dev->dev.name); output("%s board found\n", pci_name(dev));
#if 0 #if 0
output("Trident board found : mem = %X,io = %X, mem_v = %X, io_v = %X\n", output("Trident board found : mem = %X,io = %X, mem_v = %X, io_v = %X\n",
tridentfb_fix.smem_start, tridentfb_fix.mmio_start, fb_info.screen_base, default_par.io_virt); tridentfb_fix.smem_start, tridentfb_fix.mmio_start, fb_info.screen_base, default_par.io_virt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment