aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2003-09-12 14:24:17 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2003-09-12 14:24:17 +0000
commit85c16d962d8f6011b670d74d0669402ec4708f6f (patch)
tree9d946bbb945f27bb9b5430f966103303ebb6772e
parent6fc41e25e5acbbfae4d2e93a0d9e6f980f8ae477 (diff)
resolve merge conflicts
-rw-r--r--bsd/drm.h7
-rw-r--r--linux/drm.h2
-rw-r--r--shared-core/drm.h2
-rw-r--r--shared/drm.h2
4 files changed, 5 insertions, 8 deletions
diff --git a/bsd/drm.h b/bsd/drm.h
index b66b2426..73c83869 100644
--- a/bsd/drm.h
+++ b/bsd/drm.h
@@ -30,6 +30,7 @@
* Acknowledgements:
* Dec 1999, Richard Henderson <rth@twiddle.net>, move to generic cmpxchg.
*
+ * $FreeBSD: src/sys/dev/drm/drm.h,v 1.3 2003/03/09 02:08:28 anholt Exp $
*/
#ifndef _DRM_H_
@@ -45,7 +46,7 @@
#define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__FreeBSD__) && defined(XFree86Server)
+#if defined(__FreeBSD__) && defined(IN_MODULE)
/* Prevent name collision when including sys/ioccom.h */
#undef ioctl
#include <sys/ioccom.h>
@@ -78,10 +79,6 @@
#define DRM_DEV_GID 0
#endif
-#if CONFIG_XFREE86_VERSION >= XFREE86_VERSION(4,1,0,0)
-#define DRM_MAJOR 226
-#define DRM_MAX_MINOR 15
-#endif
#define DRM_NAME "drm" /* Name in kernel, /dev, and /proc */
#define DRM_MIN_ORDER 5 /* At least 2^5 bytes = 32 bytes */
#define DRM_MAX_ORDER 22 /* Up to 2^22 bytes = 4MB */
diff --git a/linux/drm.h b/linux/drm.h
index 72ea5d3a..e7443e12 100644
--- a/linux/drm.h
+++ b/linux/drm.h
@@ -47,7 +47,7 @@
#define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__FreeBSD__) && defined(XFree86Server)
+#if defined(__FreeBSD__) && defined(IN_MODULE)
/* Prevent name collision when including sys/ioccom.h */
#undef ioctl
#include <sys/ioccom.h>
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 72ea5d3a..e7443e12 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -47,7 +47,7 @@
#define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__FreeBSD__) && defined(XFree86Server)
+#if defined(__FreeBSD__) && defined(IN_MODULE)
/* Prevent name collision when including sys/ioccom.h */
#undef ioctl
#include <sys/ioccom.h>
diff --git a/shared/drm.h b/shared/drm.h
index 72ea5d3a..e7443e12 100644
--- a/shared/drm.h
+++ b/shared/drm.h
@@ -47,7 +47,7 @@
#define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__FreeBSD__) && defined(XFree86Server)
+#if defined(__FreeBSD__) && defined(IN_MODULE)
/* Prevent name collision when including sys/ioccom.h */
#undef ioctl
#include <sys/ioccom.h>