xserver: Branch 'master'

[Adam Jackson]

 glx/glxdri2.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit e3f53aa3a8dfc323c75837cd41e35b8e895d547e
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 6 14:42:34 2016 -0400

    glx/dri2: Don't include drm headers
    
    They're not needed, and they won't be present on win32.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Emil Velikov <emil.l.veikov at gmail.com>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index c2dab90..484b4ae 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -31,7 +31,6 @@
 #include <errno.h>
 #include <dlfcn.h>
 
-#include <drm.h>
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
 #include <GL/glxtokens.h>
@@ -40,7 +39,6 @@
 #include <os.h>
 
 #define _XF86DRI_SERVER_
-#include <xf86drm.h>
 #include <xf86.h>
 #include <dri2.h>