fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h
index fab7036..7fa13fc 100644 (file)
--- a/drivers/video/riva/rivafb.h
+++ b/drivers/video/riva/rivafb.h
@@ -1,7 +1,6 @@
 #ifndef __RIVAFB_H
 #define __RIVAFB_H
 
-#include <linux/config.h>
 #include <linux/fb.h>
 #include <video/vga.h>
 #include <linux/i2c.h>
@@ -46,7 +45,7 @@ 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 */
+       u8 __iomem *ctrl_base;  /* virtual control register base addr */
        unsigned dclk_max;      /* max DCLK */
 
        struct riva_regs initial_state; /* initial startup video mode */
@@ -62,6 +61,7 @@ struct riva_par {
        int FlatPanel;
        struct pci_dev *pdev;
        int bus;
+       int cursor_reset;
 #ifdef CONFIG_MTRR
        struct { int vram; int vram_valid; } mtrr;
 #endif