diff --git a/[refs] b/[refs]
index e209da39622e..324c7f861e1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9965f5b137f11a7dce01b2c32874a4875f024306
+refs/heads/master: eb3daa83c2f63743fb7597f620beac75e1ba5633
diff --git a/trunk/drivers/video/tgafb.c b/trunk/drivers/video/tgafb.c
index 5c0dab628099..89facb73edfc 100644
--- a/trunk/drivers/video/tgafb.c
+++ b/trunk/drivers/video/tgafb.c
@@ -1634,7 +1634,7 @@ tgafb_register(struct device *dev)
 		      FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_FILLRECT;
 	info->fbops = &tgafb_ops;
 	info->screen_base = par->tga_fb_base;
-	info->pseudo_palette = (void *)(par + 1);
+	info->pseudo_palette = par->palette;
 
 	/* This should give a reasonable default video mode.  */
 	if (tga_bus_pci) {
diff --git a/trunk/include/video/tgafb.h b/trunk/include/video/tgafb.h
index 03d0dbe293a8..7bc5e2c14826 100644
--- a/trunk/include/video/tgafb.h
+++ b/trunk/include/video/tgafb.h
@@ -216,6 +216,7 @@ struct tga_par {
 	u32 pll_freq;			/* pixclock in mhz */
 	u32 bits_per_pixel;		/* bits per pixel */
 	u32 sync_on_green;		/* set if sync is on green */
+	u32 palette[16];
 };