]> git.ipfire.org Git - thirdparty/qemu.git/commit
update-linux-headers: Rename SW_MAX to SW_MAX_
authorMarkus Armbruster <armbru@redhat.com>
Thu, 8 Oct 2015 16:11:39 +0000 (18:11 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Wed, 28 Oct 2015 19:45:14 +0000 (14:45 -0500)
commitd68ba3cab357f73aa74525f86f5da448b39ae34a
tree428c983f15e888a307a1e50920e5da078490e241
parent381a290266df4161de71afc8a44e67ae66bde5be
update-linux-headers: Rename SW_MAX to SW_MAX_

The next commit will compile hw/input/virtio-input.c and
hw/input/virtio-input-hid.c even when CONFIG_LINUX is off.  These
files include both "include/standard-headers/linux/input.h" and
<windows.h> then.  Doesn't work, because both define SW_MAX.  We don't
actually use it.  Patch input.h to define SW_MAX_ instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1444320700-26260-2-git-send-email-armbru@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit ac98fa849e834f48e5a64cf4b22218ba4047e142)

Conflicts:
scripts/update-linux-headers.sh

* remove dependency on eddb4de3

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
include/standard-headers/linux/input.h
scripts/update-linux-headers.sh