diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-09-04 16:11:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-09-04 16:11:07 +1000 |
| commit | 46e55bd4714ff9860f7133d45df77c2783e0c710 (patch) | |
| tree | 684234010a9e2f118cc789ad573c0b7f61026af3 /include | |
| parent | 883d7c03dcf236a19cad90045a8196313606ee40 (diff) | |
| parent | 721f1651546231c4e53a1afe31e15e8234b076e0 (diff) | |
Merge commit 'drm/drm-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/drm/drm.h b/include/drm/drm.h index 38d3c6b8276a..0864c6920941 100644 --- a/include/drm/drm.h +++ b/include/drm/drm.h @@ -36,7 +36,6 @@ #ifndef _DRM_H_ #define _DRM_H_ -#if defined(__linux__) #if defined(__KERNEL__) #endif #include <asm/ioctl.h> /* For _IO* macros */ @@ -46,22 +45,6 @@ #define DRM_IOC_WRITE _IOC_WRITE #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(IN_MODULE) -/* Prevent name collision when including sys/ioccom.h */ -#undef ioctl -#include <sys/ioccom.h> -#define ioctl(a,b,c) xf86ioctl(a,b,c) -#else -#include <sys/ioccom.h> -#endif /* __FreeBSD__ && xf86ioctl */ -#define DRM_IOCTL_NR(n) ((n) & 0xff) -#define DRM_IOC_VOID IOC_VOID -#define DRM_IOC_READ IOC_OUT -#define DRM_IOC_WRITE IOC_IN -#define DRM_IOC_READWRITE IOC_INOUT -#define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size) -#endif #define DRM_MAJOR 226 #define DRM_MAX_MINOR 15 |