summaryrefslogtreecommitdiff
path: root/shared-core/drm.h
diff options
context:
space:
mode:
authorRik Faith <faith@alephnull.com>2000-09-29 02:05:41 +0000
committerRik Faith <faith@alephnull.com>2000-09-29 02:05:41 +0000
commit52f0bc3c9ec722c0c8a40bb7959e7ec2eb9d8180 (patch)
treef98d14b28b3d50fd180d523760c65428b48231e6 /shared-core/drm.h
parent39a659e87718d8b6bbf138510e83de7a1e95d855 (diff)
More changes for sync with Linux 2.4.0-test9-pre7full-0-0-2-branchfull-0-0-1-branch
Diffstat (limited to 'shared-core/drm.h')
-rw-r--r--shared-core/drm.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 71771477..b182f2c9 100644
--- a/shared-core/drm.h
+++ b/shared-core/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)