From 52f0bc3c9ec722c0c8a40bb7959e7ec2eb9d8180 Mon Sep 17 00:00:00 2001
From: Rik Faith <faith@alephnull.com>
Date: Fri, 29 Sep 2000 02:05:41 +0000
Subject: More changes for sync with Linux 2.4.0-test9-pre7

---
 shared/drm.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'shared')

diff --git a/shared/drm.h b/shared/drm.h
index 71771477..b182f2c9 100644
--- a/shared/drm.h
+++ b/shared/drm.h
@@ -37,8 +37,10 @@
 
 #if defined(__linux__)
 #include <asm/ioctl.h>		/* For _IO* macros */
+#define DRM_IOCTL_NR(n)	     _IOC_NR(n)
 #elif defined(__FreeBSD__)
 #include <sys/ioccom.h>
+#define DRM_IOCTL_NR(n)	     ((n) & 0xff)
 #endif
 
 #define DRM_PROC_DEVICES "/proc/devices"
@@ -293,11 +295,6 @@ typedef struct drm_agp_info {
 } drm_agp_info_t;
 
 #define DRM_IOCTL_BASE	     'd'
-#if defined(__linux__)
-#define DRM_IOCTL_NR(n)	     _IOC_NR(n)
-#elif defined(__FreeBSD__)
-#define DRM_IOCTL_NR(n)	     ((n) & 0xff)
-#endif
 #define DRM_IO(nr)	     _IO(DRM_IOCTL_BASE,nr)
 #define DRM_IOR(nr,size)     _IOR(DRM_IOCTL_BASE,nr,size)
 #define DRM_IOW(nr,size)     _IOW(DRM_IOCTL_BASE,nr,size)
-- 
cgit v1.2.3