aboutsummaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-12-02 14:16:40 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2010-12-02 14:16:40 -0600
commit19c71ff41c029517c11ae67d6fbcb093a5d1150f (patch)
treec33443ac97aeb57341c2f24626cbc6d809fcdaca /Makefile.objs
parent393f398b69f9baadc3f29d822a0b5b74ca63b919 (diff)
parent0c600ce2a7a419c7247b2ac63327dea5daa3d5a2 (diff)
downloadqemu-arm-19c71ff41c029517c11ae67d6fbcb093a5d1150f.tar.gz
Merge remote branch 'mst/for_anthony' into staging
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 13ba26fdcb..257623bce9 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -217,7 +217,8 @@ hw-obj-$(CONFIG_PIIX4) += piix4.o
# PCI watchdog devices
hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
-hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o
+hw-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
+hw-obj-$(CONFIG_PCI) += msix.o msi.o
# PCI network cards
hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o