aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.objs
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2010-03-25 14:59:02 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-03-26 23:41:10 +0100
commitb305b9d7d6990e492966ffb1fdf619482adeb7e2 (patch)
treea54a12afb302195e7dc97effa499fb0e87eaa569 /Makefile.objs
parentde6a1deccf165fa88da71f8d930382c8b4990878 (diff)
target-s390: Don't compile in virtio-pci
As soon as virtio-pci.c gets compiled and used on S390 the internal qdev magic gets confused and tries to give us PCI devices instead of S390 virtio devices. Since we don't have PCI on S390, we can safely not compile virtio-pci at all. In order to do this I added a new config option "CONFIG_VIRTIO_PCI" that I enabled for every platform except S390. Thanks to this the change should be a complete nop for every other platform. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 281f7a662..8891931df 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -128,7 +128,8 @@ user-obj-y += cutils.o cache-utils.o
hw-obj-y =
hw-obj-y += loader.o
-hw-obj-y += virtio.o virtio-console.o virtio-pci.o
+hw-obj-y += virtio.o virtio-console.o
+hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o
hw-obj-y += watchdog.o
hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o