Merge branch 'master' into mpx

2008-01-10 13:38:46 +10:30
parent 4e85c7c322 0883e838e2
commit 38bf01bd1c
57 changed files with 926 additions and 551 deletions
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -587,7 +587,8 @@ InitAndStartDevices(WindowPtr root)

    for (dev = inputInfo.off_devices; dev; dev = dev->next) {
        DebugF("(dix) initialising device %d\n", dev->id);
-	ActivateDevice(dev);
+        if (!dev->inited)
+            ActivateDevice(dev);
    }

    if (!inputInfo.keyboard) { /* In theory, this cannot happen */