Merge branches 'x86-cleanups-for-linus', 'x86-vmware-for-linus', 'x86-mtrr-for-linus...

[~andy/linux] / include / video / kyro.h

diff --git a/include/video/kyro.h b/include/video/kyro.h
index 1bed37cfa68cf04bae064c0d2be5216e571f0616..dba7de2ee4a86f8643807dd5bc3f31c91e30b8de 100644 (file)
--- a/include/video/kyro.h
+++ b/include/video/kyro.h
@@ -15,6 +15,7 @@
 struct kyrofb_info {
        void __iomem *regbase;
 
+       u32 palette[16];
        u32 HTot;       /* Hor Total Time    */
        u32 HFP;        /* Hor Front Porch   */
        u32 HST;        /* Hor Sync Time     */