diff --git a/[refs] b/[refs] index 757d578d822e..62d8e5892239 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0d922562d56073f147a4de2983bee499dd2a10e +refs/heads/master: aa0aa8ab2f28d8985daa79ecab51970376e17157 diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c index 9dedc1a5e421..6b3bb1e20738 100644 --- a/trunk/drivers/video/tridentfb.c +++ b/trunk/drivers/video/tridentfb.c @@ -1350,7 +1350,7 @@ static int __devinit trident_pci_probe(struct pci_dev *dev, info->fix = tridentfb_fix; info->fbops = &tridentfb_ops; - + info->pseudo_palette = default_par->pseudo_pal; info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; #ifdef CONFIG_FB_TRIDENT_ACCEL