From 3df7bd6ce2bf07ddd09090193b4ced83ab79c127 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Wed, 18 Oct 2000 13:03:30 +0000 Subject: merge trunk into radeon branch. --- linux/drm.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'linux/drm.h') diff --git a/linux/drm.h b/linux/drm.h index d5ad7f5f..6cc9500f 100644 --- a/linux/drm.h +++ b/linux/drm.h @@ -35,7 +35,13 @@ #ifndef _DRM_H_ #define _DRM_H_ +#if defined(__linux__) #include /* For _IO* macros */ +#define DRM_IOCTL_NR(n) _IOC_NR(n) +#elif defined(__FreeBSD__) +#include +#define DRM_IOCTL_NR(n) ((n) & 0xff) +#endif #define DRM_PROC_DEVICES "/proc/devices" #define DRM_PROC_MISC "/proc/misc" @@ -290,7 +296,6 @@ typedef struct drm_agp_info { } drm_agp_info_t; #define DRM_IOCTL_BASE 'd' -#define DRM_IOCTL_NR(n) _IOC_NR(n) #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