diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-17 10:52:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-17 10:52:12 +0100 |
| commit | fd1a9ef9c2493b5bc98e8e041333a57b635c5d71 (patch) | |
| tree | 3ea0e8eebf0953e6f7bf5102c082da63fbe0f8bc /scripts/update-linux-headers.sh | |
| parent | b4329bf41c86bac8b56cadb097081960cc4839a0 (diff) | |
| parent | 562f93754b95fd6dc65ad9a2aa15a90b2da7e8a4 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150717-1' into staging
input: fixes for 2.4
# gpg: Signature made Fri Jul 17 07:45:17 2015 BST using RSA key ID D3E87138
# 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>"
* remotes/kraxel/tags/pull-input-20150717-1:
hid: clarify hid_keyboard_process_keycode
virtio-input: move sys/ioctl.h include
virtio-input: fix segfault in virtio_input_hid_properties
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/update-linux-headers.sh')
| -rwxr-xr-x | scripts/update-linux-headers.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh index 47378d93d4..f0e830c2d6 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -56,6 +56,7 @@ cp_virtio() { -e 's/__bitwise__//' \ -e 's/__attribute__((packed))/QEMU_PACKED/' \ -e 's/__inline__/inline/' \ + -e '/sys\/ioctl.h/d' \ "$f" > "$to/$header"; done fi |