drm: Branch 'master'

 xf86drm.c |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit f3c6740f0c27d98d16340396f1a15e10384f9284
Author: Emil Velikov <[email protected]>
Date:   Fri Aug 7 16:13:32 2015 +0100

    xf86drm: remove makedev() hack/workaround
    
    Back when this was introduced commit 569da5a42eb(Merged glxmisc-3-0-0)
    sys/sysmacros.h was used instead of the respecive headers (as per the
    manual).
    
    We've been handling it correctly for a little while now - in Linux, BSD
    and Solaris. Thus we can drop this workaround.
    
    Signed-off-by: Emil Velikov <[email protected]>

diff --git a/xf86drm.c b/xf86drm.c
index 789bfc2..a9f5c29 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -98,14 +98,6 @@
 #define DRM_MAJOR 226		/* Linux */
 #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.
- */
-#ifndef makedev
-#define makedev(x,y)    ((dev_t)(((x) << 8) | (y)))
-#endif
-
 #define DRM_MSG_VERBOSITY 3
 
 #define memclear(s) memset(&s, 0, sizeof(s))

------------------------------------------------------------------------------
--