xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/xorg-wrapper.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 19b0249a5e07b9fc008e5d8709d7e489874415de
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Nov 16 11:06:57 2015 +0100

    Xorg.wrap: activate libdrm based detection for KMS drivers
    
    Xorg.wrap includes code guarded with WITH_LIBDRM for detecting KMS drivers.
    Unfortunately it is never activated since code missed to include file
    which defines WITH_LIBDRM.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92894
    Signed-off-by: Arkadiusz Miśkiewicz <arekm at maven.pl>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/hw/xfree86/xorg-wrapper.c b/hw/xfree86/xorg-wrapper.c
index 4c37cfc..d930962 100644
--- a/hw/xfree86/xorg-wrapper.c
+++ b/hw/xfree86/xorg-wrapper.c
@@ -24,6 +24,7 @@
  */
 
 #include "dix-config.h"
+#include "xorg-config.h"
 
 #include <errno.h>
 #include <fcntl.h>