diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-20 16:34:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-20 16:34:26 +0000 |
| commit | 940a8ce075e3408742a4edcabfd6c2a15e2539eb (patch) | |
| tree | 2123c42b0e9ae5b916c4c9d6d8cd6ace39f595b2 /hw/display | |
| parent | 373967b2ed630c80462ef2847709fb93f33b8951 (diff) | |
| parent | b3d3a426da9b067366bc132d53a6fa6b72675b55 (diff) | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
fixes for 2.9-rc1, plus removal of -mno-cygwin references
# gpg: Signature made Mon 20 Mar 2017 11:25:07 GMT
# gpg: using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
hax: fix breakage in locking
configure: remove Cygwin
xen: do not build backends for targets that do not support xen
qemu-ga: obey LISTEN_PID when using systemd socket activation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 063889beaf..3d02e8bfc5 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -5,7 +5,7 @@ common-obj-$(CONFIG_JAZZ_LED) += jazz_led.o common-obj-$(CONFIG_PL110) += pl110.o common-obj-$(CONFIG_SSD0303) += ssd0303.o common-obj-$(CONFIG_SSD0323) += ssd0323.o -common-obj-$(CONFIG_XEN_BACKEND) += xenfb.o +common-obj-$(CONFIG_XEN) += xenfb.o common-obj-$(CONFIG_VGA_PCI) += vga-pci.o common-obj-$(CONFIG_VGA_ISA) += vga-isa.o |