diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-12-17 08:21:29 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-12-17 08:21:29 -0600 |
| commit | b254b0d15d48efc3bd43ae535158ded3c1519257 (patch) | |
| tree | 856460106817ca5ccbab285b474a52cdcac2a46e /Makefile.objs | |
| parent | 36888c6335422f07bbc50bf3443a39f24b90c7c6 (diff) | |
| parent | 513691b7ff20262efe9aafb85c8dd4615588ad48 (diff) | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index cebb9458f1..07e46140d0 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -168,7 +168,8 @@ hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o hw-obj-y += fw_cfg.o # FIXME: Core PCI code and its direct dependencies are required by the # QMP query-pci command. -hw-obj-y += pci.o pci_bridge.o msix.o msi.o +hw-obj-y += pci.o pci_bridge.o +hw-obj-$(CONFIG_PCI) += msix.o msi.o hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o hw-obj-y += watchdog.o |