diff options
| author | David Dawes <dawes@xfree86.org> | 2000-08-16 18:29:06 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2000-08-16 18:29:06 +0000 |
| commit | cba4d3504c843f6f66ffc0b477f86b4ee0048065 (patch) | |
| tree | d5e4b9ae0cadb8d3d284c8520a60c868b5c08365 /libdrm/xf86drm.c | |
| parent | 0cbca9cca2a9680bcced7d2ffe47599a37c7fea9 (diff) | |
first part of 4.0.1b merge
Diffstat (limited to 'libdrm/xf86drm.c')
| -rw-r--r-- | libdrm/xf86drm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index e4bc53bc..10c2222c 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.14 2000/06/27 16:42:07 alanh Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.15 2000/08/09 14:44:27 alanh Exp $ * */ @@ -71,8 +71,6 @@ extern int xf86RemoveSIGIOHandler(int fd); #ifdef __alpha__ extern unsigned long _bus_base(void); #define BUS_BASE _bus_base() -#else -#define BUS_BASE (0) #endif /* Not all systems have MAP_FAILED defined */ @@ -504,7 +502,7 @@ int drmAddMap(int fd, map.offset = offset; #ifdef __alpha__ - if (!(type & DRM_SHM)) + if (type != DRM_SHM) map.offset += BUS_BASE; #endif map.size = size; |