On 12/29/2015 06:28 PM, Stefan Weil wrote:
Am 29.12.2015 um 11:13 schrieb Cao jin:
merge three lines into one line
Signed-off-by: Cao jin <caoj.f...@cn.fujitsu.com>
---
hw/xen/Makefile.objs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs
index a9ad7e7..77806f0 100644
--- a/hw/xen/Makefile.objs
+++ b/hw/xen/Makefile.objs
@@ -1,6 +1,4 @@
# xen backend driver support
common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.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
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o
xen_pt_msi.o xen_pt_graphics.o
+obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o
xen_pt_msi.o xen_pt_graphics.o xen-host-pci-device.o
Obviously commit 798141799ccd5235a928b8fc0411d7d74e706489
added duplicate .o entries which of course should be removed.
I suggest to keep the first line separate instead of merging it.
That preserves the alphabetic order and avoids a long line.
Ok, v2 is coming soon:)
Regards,
Stefan
--
Yours Sincerely,
Cao Jin