From d87c873df05eb3a110316c7af2358553fa7f988e Mon Sep 17 00:00:00 2001
From: David Dawes <dawes@xfree86.org>
Date: Thu, 14 Jun 2001 22:23:44 +0000
Subject: First pass of 4.1.0 merge.

---
 linux-core/i810_drm.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'linux-core/i810_drm.h')

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;
-- 
cgit v1.2.3