commit 751d63c371045dafc76f0e87fcdc41967c59e04d
author Anthony Liguori <aliguori@us.ibm.com> Mon Aug 29 08:48:28 2011 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Mon Aug 29 08:48:28 2011 -0500
tree f557815743424765bcf9a3de30d0fa482965166c
parent c783924136e166d6034859d87118195f4c08d68f
parent 73c92f9aecc099aa81ee05a2bdb30bb43184cc28

Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging

hw/sh_pci.c

diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index 76061bb..36f3930 100644
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -150,7 +150,7 @@
                               PCI_DEVFN(0, 0), 4);
     memory_region_init_io(&s->memconfig_p4, &sh_pci_reg_ops, s,
                           "sh_pci", 0x224);
-    memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_a7,
+    memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_p4,
                              0, 0x224);
     isa_mmio_setup(&s->isa, 0x40000);
     sysbus_init_mmio_cb2(dev, sh_pci_map, sh_pci_unmap);