vserver 1.9.3

[linux-2.6.git] / drivers / video / riva / rivafb.h

diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h
index 198a29c..fab7036 100644 (file)
--- a/drivers/video/riva/rivafb.h
+++ b/drivers/video/riva/rivafb.h
@@ -44,16 +44,17 @@ struct riva_i2c_chan {
 
 struct riva_par {
        RIVA_HW_INST riva;      /* interface to riva_hw.c */
-
+       u32 pseudo_palette[16]; /* default palette */
+       u32 palette[16];        /* for Riva128 */
        caddr_t ctrl_base;      /* virtual control register base addr */
        unsigned dclk_max;      /* max DCLK */
 
        struct riva_regs initial_state; /* initial startup video mode */
        struct riva_regs current_state;
+#ifdef CONFIG_X86
        struct vgastate state;
+#endif
        atomic_t ref_count;
-       u32 cursor_data[32 * 32/4];
-       int cursor_reset;
        unsigned char *EDID;
        unsigned int Chipset;
        int forceCRTC;