xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/dri/xf86dri.c |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit e50da50118408a195d4d2e1b39817fe7c4447c56
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 25 15:08:25 2017 -0500

    dri1: Remove some dead event code
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index 68f8b7e..fcae73d 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -599,14 +599,7 @@ XFree86DRIExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 
-#ifdef XF86DRI_EVENTS
-    EventType = CreateNewResourceType(XF86DRIFreeEvents, "DRIEvent");
-#endif
-
     if (DRIExtensionInit() &&
-#ifdef XF86DRI_EVENTS
-        EventType && ScreenPrivateIndex != -1 &&
-#endif
         (extEntry = AddExtension(XF86DRINAME,
                                  XF86DRINumberEvents,
                                  XF86DRINumberErrors,