diff options
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.27/0001-drm-remove-define-for-non-linux-systems.patch')
| -rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.27/0001-drm-remove-define-for-non-linux-systems.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.27/0001-drm-remove-define-for-non-linux-systems.patch b/meta-moblin/packages/linux/linux-moblin-2.6.27/0001-drm-remove-define-for-non-linux-systems.patch new file mode 100644 index 0000000000..588c1af70b --- /dev/null +++ b/meta-moblin/packages/linux/linux-moblin-2.6.27/0001-drm-remove-define-for-non-linux-systems.patch @@ -0,0 +1,48 @@ +commit 2e6ec7cdc09f36be1cbe9aeaccfc45f307fc0060 +Author: Carlos R. Mafra <crmafra2@gmail.com> +Date: Wed Jul 30 12:29:37 2008 -0700 + + drm: remove #define's for non-linux systems + + There is no point in considering FreeBSD et al. in the linux kernel + source code. + + Signed-off-by: Carlos R. Mafra <crmafra@gmail.com> + Signed-off-by: Andrew Morton <akpm@linux-foundation.org> + Signed-off-by: Dave Airlie <airlied@redhat.com> + +diff --git a/include/drm/drm.h b/include/drm/drm.h +index 38d3c6b..0864c69 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 |