aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/tgafb.c2
-rw-r--r--include/video/tgafb.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 5c0dab628099..89facb73edfc 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -1634,7 +1634,7 @@ tgafb_register(struct device *dev)
1634 FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_FILLRECT; 1634 FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_FILLRECT;
1635 info->fbops = &tgafb_ops; 1635 info->fbops = &tgafb_ops;
1636 info->screen_base = par->tga_fb_base; 1636 info->screen_base = par->tga_fb_base;
1637 info->pseudo_palette = (void *)(par + 1); 1637 info->pseudo_palette = par->palette;
1638 1638
1639 /* This should give a reasonable default video mode. */ 1639 /* This should give a reasonable default video mode. */
1640 if (tga_bus_pci) { 1640 if (tga_bus_pci) {
diff --git a/include/video/tgafb.h b/include/video/tgafb.h
index 03d0dbe293a8..7bc5e2c14826 100644
--- a/include/video/tgafb.h
+++ b/include/video/tgafb.h
@@ -216,6 +216,7 @@ struct tga_par {
216 u32 pll_freq; /* pixclock in mhz */ 216 u32 pll_freq; /* pixclock in mhz */
217 u32 bits_per_pixel; /* bits per pixel */ 217 u32 bits_per_pixel; /* bits per pixel */
218 u32 sync_on_green; /* set if sync is on green */ 218 u32 sync_on_green; /* set if sync is on green */
219 u32 palette[16];
219}; 220};
220 221
221 222