diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2011-01-10 13:43:48 +0200 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2011-01-10 13:43:48 +0200 |
commit | 6107ff12922e5508a44b376b40a3041810cb00d2 (patch) | |
tree | 56098d53043a8fcdd01dbf0dca565ceab09f95b3 /Makefile.target | |
parent | be92bbf73dfd7d8a4786dc5f6c71590f4fbc5a32 (diff) | |
parent | 8aaf42ed0f203da63860b0a3ab3ff2bdfe9b4cb0 (diff) |
Merge remote branch 'origin/master' into pci
Diffstat (limited to 'Makefile.target')
-rw-r--r-- | Makefile.target | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target index 38582d4bde..e15b1c4fb6 100644 --- a/Makefile.target +++ b/Makefile.target @@ -219,6 +219,7 @@ obj-i386-y += vmmouse.o vmport.o hpet.o applesmc.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += debugcon.o multiboot.o obj-i386-y += pc_piix.o +obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o # shared objects obj-ppc-y = ppc.o |