From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 12 Sep 2003 14:24:17 +0000 (+0000)
Subject: resolve merge conflicts
X-Git-Tag: submit/1.0/20121108.012404~2231
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85c16d962d8f6011b670d74d0669402ec4708f6f;p=profile%2Fivi%2Flibdrm.git

resolve merge conflicts
---

diff --git a/bsd/drm.h b/bsd/drm.h
index b66b242..73c8386 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 72ea5d3..e7443e1 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 72ea5d3..e7443e1 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 72ea5d3..e7443e1 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>