Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / include / video / tgafb.h

diff --git a/include/video/tgafb.h b/include/video/tgafb.h
index 03d0dbe293a8718902663f2ec190b545c4e6dae8..7bc5e2c1482617fd185c74fb8d78ded3abc69abd 100644 (file)
--- a/include/video/tgafb.h
+++ b/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];
 };