diff options
| author | Alexander Graf <agraf@suse.de> | 2010-04-06 12:11:43 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-04-08 21:49:15 +0200 |
| commit | e9d0fc74636cd713414c17139659ad2f69a46da0 (patch) | |
| tree | 8d1510130f770fc67bf9a26035421df316a34658 /Makefile.target | |
| parent | a7200c9f9889f681bdcdd0b68a5cf37471bc4327 (diff) | |
Make virtio-pci building conditional again
Commit b305b9d7d6990e492966ffb1fdf619482adeb7e2 made building of virtio-pci
conditional and not enabled on S390x, because it collides with the S390 bus.
Commit 087431d1d1bf4e785edfa89e8cd05fcdac558dc3 accidentially reverted that
behavior, breaking S390x again.
So here's a follow-up patch disabling building of virtio-pci on S390x again.
This unbreaks the S390x target.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index 45cbe56bd..2624b1d21 100644 --- a/Makefile.target +++ b/Makefile.target @@ -164,7 +164,8 @@ ifdef CONFIG_SOFTMMU obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly -obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o +obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += event_notifier.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o |