From 85c16d962d8f6011b670d74d0669402ec4708f6f Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 12 Sep 2003 14:24:17 +0000
Subject: resolve merge conflicts

---
 shared/drm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shared/drm.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>
-- 
cgit v1.2.3