diff options
| author | Keith Packard <keithp@keithp.com> | 2010-03-29 11:44:07 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-03-29 11:44:07 -0700 |
| commit | 4b3d67a7647f696957727948f9757a261e15d14e (patch) | |
| tree | 3ed20499491cc6754890f5d6057cdc78a9bb54b5 /hw | |
| parent | 579715f830fbbca9e1ecb17dc18176132f5969e7 (diff) | |
| parent | aa91508356f243edc3b11795b1481edcfe0d39c2 (diff) | |
Merge remote branch 'whot/for-keith'
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/os-support/shared/posix_tty.c | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index e9f7f2fb7..822922717 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -618,6 +618,7 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs) "InputClass configuration"); return BadAlloc; } + mergedopts = xf86ReplaceStrOption(mergedopts, "driver", idev->driver); } idev->commonOptions = xf86optionListMerge(idev->commonOptions, mergedopts); diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index bf1bb03a3..4ba8599ab 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -137,19 +137,9 @@ xf86OpenSerial (pointer options) if (!isatty (fd)) { -#if 1 /* Allow non-tty devices to be opened. */ xfree(dev); return (fd); -#else - xf86Msg (X_WARNING, - "xf86OpenSerial: Specified device %s is not a tty\n", - dev); - SYSCALL (close (fd)); - errno = EINVAL; - xfree(dev); - return (-1); -#endif } /* set up default port parameters */ |