summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2013-05-30 12:09:20 +0300
committerMichael S. Tsirkin <mst@redhat.com>2013-06-02 18:13:37 +0300
commitcbef02f819b05112cb626a955d8c86e30afe6a9f (patch)
tree98649df17e2b62ea339f691f3fd91be38b39675e
parent68c0e134a090666246b467deaf9046e573b089f2 (diff)
downloadqemu-cbef02f819b05112cb626a955d8c86e30afe6a9f.tar.gz
dec.c - move to pci-bridge
Looks like dec.c is in pci-host by mistake. Moving it over to pci-bridge. Acked-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/pci-bridge/Makefile.objs2
-rw-r--r--hw/pci-bridge/dec.c (renamed from hw/pci-host/dec.c)0
-rw-r--r--hw/pci-bridge/dec.h (renamed from hw/pci-host/dec.h)0
-rw-r--r--hw/pci-host/Makefile.objs1
4 files changed, 2 insertions, 1 deletions
diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
index 5dd92d28a0..968b3694ab 100644
--- a/hw/pci-bridge/Makefile.objs
+++ b/hw/pci-bridge/Makefile.objs
@@ -1,3 +1,5 @@
common-obj-y += pci_bridge_dev.o
common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o
common-obj-y += i82801b11.o
+# NewWorld PowerMac
+common-obj-$(CONFIG_DEC_PCI) += dec.o
diff --git a/hw/pci-host/dec.c b/hw/pci-bridge/dec.c
index cff458b574..cff458b574 100644
--- a/hw/pci-host/dec.c
+++ b/hw/pci-bridge/dec.c
diff --git a/hw/pci-host/dec.h b/hw/pci-bridge/dec.h
index 17dc0c2b0a..17dc0c2b0a 100644
--- a/hw/pci-host/dec.h
+++ b/hw/pci-bridge/dec.h
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
index 909e702eef..bb65f9c4d2 100644
--- a/hw/pci-host/Makefile.objs
+++ b/hw/pci-host/Makefile.objs
@@ -5,7 +5,6 @@ common-obj-$(CONFIG_PREP_PCI) += prep.o
common-obj-$(CONFIG_GRACKLE_PCI) += grackle.o
# NewWorld PowerMac
common-obj-$(CONFIG_UNIN_PCI) += uninorth.o
-common-obj-$(CONFIG_DEC_PCI) += dec.o
# PowerPC E500 boards
common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o