Merge commit 'v2.6.26-rc9' into cpus4096

[linux-2.6-omap-h63xx.git] / drivers / char / drm / i810_drm.h

diff --git a/drivers/char/drm/i810_drm.h b/drivers/char/drm/i810_drm.h
index 2deb925a94f354229c376659df2eb40cf824b0f5..7a10bb6f2c0f2f6d54160e06316b506506f9c592 100644 (file)
--- a/drivers/char/drm/i810_drm.h
+++ b/drivers/char/drm/i810_drm.h
@@ -102,13 +102,8 @@ typedef enum _drm_i810_init_func {
 /* This is the init structure after v1.2 */
 typedef struct _drm_i810_init {
        drm_i810_init_func_t func;
-#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0)
-       int ring_map_idx;
-       int buffer_map_idx;
-#else
        unsigned int mmio_offset;
        unsigned int buffers_offset;
-#endif
        int sarea_priv_offset;
        unsigned int ring_start;
        unsigned int ring_end;
@@ -158,7 +153,7 @@ typedef struct _drm_i810_sarea {
        unsigned int dirty;
 
        unsigned int nbox;
-       drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS];
+       struct drm_clip_rect boxes[I810_NR_SAREA_CLIPRECTS];
 
        /* Maintain an LRU of contiguous regions of texture space.  If
         * you think you own a region of texture memory, and it has an