diff options
Diffstat (limited to 'xorg-server/hw/kdrive/src/kinput.c')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kinput.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index 318d233d4..fb8ebd076 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -1120,7 +1120,6 @@ KdParseKeyboard (char *arg) ki->path = NULL; ki->driver = NULL; ki->driverPrivate = NULL; - ki->xkb = NULL; ki->next = NULL; if (!arg) @@ -2273,6 +2272,14 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) return BadValue; } } +#ifdef CONFIG_HAL + else if (strcmp(option->key, "_source") == 0 && + strcmp(option->value, "server/hal") == 0) + { + ErrorF("Ignoring device from HAL.\n"); + return BadValue; + } +#endif } if (!ki && !pi) { |