xserver: Branch 'master'

[Keith Packard]

 dix/devices.c |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit cf4f3d051858aadedd6e333bb317a1daa3987ad7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri May 21 13:30:25 2010 +1000

    dix: remove obsolete comment.from EnableDevice.
    
    The code this comment was referring to was removed in
    8b5086250aa5dae8de8b763408ff480d7beac819 "Eliminate bogus event resizing."
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/devices.c b/dix/devices.c
index de72c88..ab8c3f9 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -311,10 +311,6 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
         }
     }
 
-    /* Before actually enabling the device, we need to make sure the event
-     * list's events have enough memory for a ClassesChangedEvent from the
-     * device
-     */
     if ((*prev != dev) || !dev->inited ||
 	((ret = (*dev->deviceProc)(dev, DEVICE_ON)) != Success)) {
         ErrorF("[dix] couldn't enable device %d\n", dev->id);