This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / video / i810 / i810.h

diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index fe3b757..68b6423 100644 (file)
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -201,7 +201,6 @@
 #define HAS_ACCELERATION            2
 #define ALWAYS_SYNC                 4
 #define LOCKUP                      8
-#define USE_HWCUR                  16
 
 struct gtt_data {
        struct agp_memory *i810_fb_memory;
@@ -223,7 +222,7 @@ struct mode_registers {
 
 struct heap_data {
         unsigned long physical;
-       __u8 __iomem *virtual;
+       __u8 *virtual;
        u32 offset;
        u32 size;
 };     
@@ -252,10 +251,12 @@ struct i810fb_par {
        struct heap_data         iring;
        struct heap_data         cursor_heap;
        struct vgastate          state;
+       drm_agp_t                *drm_agp;
        atomic_t                 use_count;
        u32 pseudo_palette[17];
+       u32 pci_state[16];
        unsigned long mmio_start_phys;
-       u8 __iomem *mmio_start_virtual;
+       u8 *mmio_start_virtual;
        u32 pitch;
        u32 pixconf;
        u32 watermark;