summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDavid Dawes <dawes@xfree86.org>2001-06-14 22:23:44 +0000
committerDavid Dawes <dawes@xfree86.org>2001-06-14 22:23:44 +0000
commitd87c873df05eb3a110316c7af2358553fa7f988e (patch)
treee6ac996160b926f4af69d0db523db1a773435897 /linux-core
parent334e134918ee2ece3e845cd55c49c9709b67ee6c (diff)
First pass of 4.1.0 merge.
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i810_drm.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/linux-core/i810_drm.h b/linux-core/i810_drm.h
index cee189b7..5d47adda 100644
--- a/linux-core/i810_drm.h
+++ b/linux-core/i810_drm.h
@@ -98,8 +98,13 @@ typedef struct _drm_i810_init {
I810_INIT_DMA = 0x01,
I810_CLEANUP_DMA = 0x02
} 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;