From 7503d1340726e0a529f04304d177ed2ceb8fbc91 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun, 14 Oct 2007 07:50:13 +0930
Subject: [PATCH] dix: don't check VCK and VCP separately when looking for
 device ids.

Both are part of the device list again, so we cover them there.
---
 dix/devices.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index b4d04b47e..7a9932a2d 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -107,10 +107,6 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart)
 
     /* Find next available id */
     memset(devind, 0, sizeof(char)*MAX_DEVICES);
-    if (inputInfo.keyboard)
-        devind[inputInfo.keyboard->id]++;
-    if (inputInfo.pointer)
-        devind[inputInfo.pointer->id]++;
     for (devtmp = inputInfo.devices; devtmp; devtmp = devtmp->next)
 	devind[devtmp->id]++;
     for (devtmp = inputInfo.off_devices; devtmp; devtmp = devtmp->next)