aboutsummaryrefslogtreecommitdiff
path: root/libdrm/xf86drm.h
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-10-18 17:33:19 +0200
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2006-10-18 17:33:19 +0200
commite22b04f807b9869c8c89b6316214517f5da13322 (patch)
treee2bf963e8704a0a9e0ec37a791c119e6e0995ed2 /libdrm/xf86drm.h
parent11aaa358a0f56afb64df44c737ec331d90118537 (diff)
parente172945d668f1de1243ac2ae91ab77f3b2bda40a (diff)
Merging drm-ttm-0-2-branch
Conflicts: linux-core/drmP.h linux-core/drm_drv.c linux-core/drm_irq.c linux-core/drm_stub.c shared-core/drm.h shared-core/i915_drv.h shared-core/i915_irq.c
Diffstat (limited to 'libdrm/xf86drm.h')
-rw-r--r--libdrm/xf86drm.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libdrm/xf86drm.h b/libdrm/xf86drm.h
index d58baa76..86ee7d30 100644
--- a/libdrm/xf86drm.h
+++ b/libdrm/xf86drm.h
@@ -283,7 +283,6 @@ typedef struct _drmSetVersion {
int drm_dd_minor;
} drmSetVersion, *drmSetVersionPtr;
-
#define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock)
#define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */
@@ -487,6 +486,8 @@ do { register unsigned int __old __asm("o0"); \
} \
} while(0)
+
+
/* General user-level programmer's API: unprivileged */
extern int drmAvailable(void);
extern int drmOpen(const char *name, const char *busid);
@@ -636,4 +637,6 @@ extern int drmSLLookupNeighbors(void *l, unsigned long key,
unsigned long *prev_key, void **prev_value,
unsigned long *next_key, void **next_value);
+#include "xf86mm.h"
+
#endif