diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 07:30:31 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-29 07:30:31 -0500 |
| commit | fdc43322c978d78e79e692872dcec7b4f6a447f1 (patch) | |
| tree | 86aa2d2d8ee97f537b29aa04a2cfa4d421b1a3ce /hw/xen/Makefile.objs | |
| parent | b0a71c3b397b12db727ce483f01b3336160ef6a1 (diff) | |
| parent | 8fbab3b62a271526c782110aed0ae160eb38c296 (diff) | |
Merge remote-tracking branch 'sstabellini/xen-130729' into staging
# By Paul Durrant (1) and Stefano Stabellini (1)
# Via Stefano Stabellini
* sstabellini/xen-130729:
Xen PV Device
xen_disk: support "direct-io-safe" backend option
Message-id: 1375096790-12815-1-git-send-email-stefano.stabellini@eu.citrix.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/xen/Makefile.objs')
| -rw-r--r-- | hw/xen/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs index 20175602b6..ce640c61a5 100644 --- a/hw/xen/Makefile.objs +++ b/hw/xen/Makefile.objs @@ -1,6 +1,6 @@ # xen backend driver support common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o -obj-$(CONFIG_XEN_I386) += xen_platform.o xen_apic.o +obj-$(CONFIG_XEN_I386) += xen_platform.o xen_apic.o xen_pvdevice.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o |