From 18fc5ee92394b31c00df8e72b1f29bada79292f5 Mon Sep 17 00:00:00 2001
From: David Dawes <dawes@xfree86.org>
Date: Mon, 9 Apr 2001 21:56:31 +0000
Subject: First pass of XFree86 4.0.99.2 merge.

---
 libdrm/xf86drm.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'libdrm/xf86drm.c')

diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index bb719edb..33d387e9 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -27,7 +27,7 @@
  * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
  *	    Kevin E. Martin <martin@valinux.com>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.17 2000/09/24 13:51:32 alanh Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.18 2001/03/21 18:08:54 dawes Exp $
  *
  */
 
@@ -164,7 +164,11 @@ static drmHashEntry *drmGetEntry(int fd)
 
 static int drmOpenDevice(long dev, int minor)
 {
-    stat_t          st;
+#ifdef XFree86LOADER
+    struct xf86stat st;
+#else
+    struct stat     st;
+#endif
     char            buf[64];
     int             fd;
     mode_t          dirmode = DRM_DEV_DIRMODE;
@@ -485,6 +489,11 @@ int drmAddMap(int fd,
     drm_map_t map;
 
     map.offset  = offset;
+#ifdef __alpha__
+    /* Make sure we add the bus_base to all but shm */
+    if (type != DRM_SHM)
+	map.offset += BUS_BASE;
+#endif
     map.size    = size;
     map.handle  = 0;
     map.type    = type;
-- 
cgit v1.2.3