summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Noland <rnoland@2hip.net>2009-11-25 15:09:24 -0600
committerRobert Noland <rnoland@2hip.net>2009-11-25 15:09:24 -0600
commit6f66de982ad6ee6967ec61a7399e600bdd9e5887 (patch)
tree1290fde13cf642b2d988c513cb8f3d15f395f72a
parent9558f6377ffee680d6bec0808bc113b3139b0d5f (diff)
Correctly set DRM_MAX_MINOR for all platforms.
DRM_MAJOR is platform specific, but not used outside of xf86drm.c that I can find.
-rw-r--r--xf86drm.c4
-rw-r--r--xf86drm.h6
2 files changed, 4 insertions, 6 deletions
diff --git a/xf86drm.c b/xf86drm.c
index 364fe17d..06d645dd 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -75,10 +75,6 @@
#define DRM_MAJOR 226 /* Linux */
#endif
-#ifndef DRM_MAX_MINOR
-#define DRM_MAX_MINOR 16
-#endif
-
/*
* This definition needs to be changed on some systems if dev_t is a structure.
* If there is a header file we can get it from, there would be best.
diff --git a/xf86drm.h b/xf86drm.h
index 9944d32f..496d95d8 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -39,6 +39,10 @@
#include <stdint.h>
#include <drm.h>
+#ifndef DRM_MAX_MINOR
+#define DRM_MAX_MINOR 16
+#endif
+
#if defined(__linux__)
#define DRM_IOCTL_NR(n) _IOC_NR(n)
@@ -47,8 +51,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)
-#define DRM_MAJOR 226
-#define DRM_MAX_MINOR 15
#else /* One of the *BSDs */