summaryrefslogtreecommitdiffstats
path: root/hw/display/Makefile.objs
diff options
context:
space:
mode:
authorAnthony Liguori2013-09-20 15:08:18 +0200
committerAnthony Liguori2013-09-20 15:08:18 +0200
commit2571f8f5fbaea5dc3bdcd84737f109b459576e90 (patch)
tree3691da9f2f6aa712a0a224aa466ce6d0a2e0a8ad /hw/display/Makefile.objs
parentMerge remote-tracking branch 'kraxel/usb.90' into staging (diff)
parentqxl: compile only once (diff)
downloadqemu-2571f8f5fbaea5dc3bdcd84737f109b459576e90.tar.gz
qemu-2571f8f5fbaea5dc3bdcd84737f109b459576e90.tar.xz
qemu-2571f8f5fbaea5dc3bdcd84737f109b459576e90.zip
Merge remote-tracking branch 'spice/spice.v74' into staging
# By Gerd Hoffmann # Via Gerd Hoffmann * spice/spice.v74: qxl: compile only once qxl: simplify page dirtying qxl: simplify qxl_rom_size qxl: define qxl operating on 4k pages Message-id: 1379583534-7831-1-git-send-email-kraxel@redhat.com
Diffstat (limited to 'hw/display/Makefile.objs')
-rw-r--r--hw/display/Makefile.objs3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index 6e9fb3b695..540df82600 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -31,5 +31,4 @@ obj-$(CONFIG_TCX) += tcx.o
obj-$(CONFIG_VGA) += vga.o
-common-obj-$(CONFIG_QXL) += qxl-logger.o qxl-render.o
-obj-$(CONFIG_QXL) += qxl.o
+common-obj-$(CONFIG_QXL) += qxl.o qxl-logger.o qxl-render.o