diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-10-18 13:03:30 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-10-18 13:03:30 +0000 |
| commit | 3df7bd6ce2bf07ddd09090193b4ced83ab79c127 (patch) | |
| tree | a2f95d5a32210359c9c0ee29e0876ebd77addf41 /linux/drm.h | |
| parent | 8648348667d15a26529dbc64dcf52f98fc62c63a (diff) | |
merge trunk into radeon branch.radeon-1-0-0-20001017radeon-1-0-0-branch
Diffstat (limited to 'linux/drm.h')
| -rw-r--r-- | linux/drm.h | 7 |
1 files changed, 6 insertions, 1 deletions
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 <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" #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) |