diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 13:38:34 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 13:38:34 +0000 |
commit | 6753e4ed150ca1f94651aad06c031680a0be6cac (patch) | |
tree | 32b143279ec3db819f40d33e1b539ffdde699a5b /docs | |
parent | 5d42ff913bb294c661aed8dfcd386fed9e185148 (diff) | |
parent | 378af96155d62d90c876ee5e7648803247f1d864 (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20170220-1' into staging
input: add wctablet, ps2 fix
# gpg: Signature made Mon 20 Feb 2017 11:42:12 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-input-20170220-1:
Add wctablet device
ps2: fix mouse mappings for right/middle button
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/qdev-device-use.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index 136d271120..b059405e0e 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -200,7 +200,7 @@ LEGACY-CHARDEV translates to -chardev HOST-OPTS... as follows: * null becomes -chardev null -* pty, msmouse, braille, stdio likewise +* pty, msmouse, wctablet, braille, stdio likewise * vc:WIDTHxHEIGHT becomes -chardev vc,width=WIDTH,height=HEIGHT |