diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-29 08:48:28 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-29 08:48:28 -0500 |
commit | 751d63c371045dafc76f0e87fcdc41967c59e04d (patch) | |
tree | f557815743424765bcf9a3de30d0fa482965166c /hw | |
parent | c783924136e166d6034859d87118195f4c08d68f (diff) | |
parent | 73c92f9aecc099aa81ee05a2bdb30bb43184cc28 (diff) |
Merge remote-tracking branch 'qemu-kvm/memory/urgent' into staging
Diffstat (limited to 'hw')
-rw-r--r-- | hw/sh_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sh_pci.c b/hw/sh_pci.c index 76061bb756..36f39300d5 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -150,7 +150,7 @@ static int sh_pci_init_device(SysBusDevice *dev) 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); |