xserver: Branch 'master'

[Peter Hutterer]

 mi/mieq.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit afa680e495622f521cae80563511c0d284f57551
Author: David Miller <davem at davemloft.net>
Date:   Thu Jun 11 05:15:05 2009 -0700

    mi: ignore DGA events in ChangeDeviceID
    
    DGA events don't have a deviceid, so they don't need changing.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/mi/mieq.c b/mi/mieq.c
index 8ceda43..0f07b16 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -277,6 +277,10 @@ ChangeDeviceID(DeviceIntPtr dev, InternalEvent* event)
         case ET_DeviceChanged:
             event->device.deviceid = dev->id;
             break;
+#if XFreeXDGA
+	case ET_DGAEvent:
+	    break;
+#endif
         case ET_Raw:
             event->raw.deviceid = dev->id;
             break;