summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-10-14 07:50:13 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-10-16 12:04:30 +0930
commit7503d1340726e0a529f04304d177ed2ceb8fbc91 (patch)
tree6c51e376e3a5e9ae8fc6d386d23e35fd1776477f
parent032e906711202d376af95b37bb0cdf14a3648256 (diff)
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.
-rw-r--r--dix/devices.c4
1 files changed, 0 insertions, 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)