diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 08:43:38 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-05 08:43:38 -0600 |
| commit | 01e7a53aed945adafc3ee54e2159227839daf0b4 (patch) | |
| tree | 992b5c4a38316289ed5b2fa6ddf486cb3d59bead /hw/stellaris_enet.c | |
| parent | 4eb2d2d900eb6f63cad2b5cb6ca4273bfb9b230c (diff) | |
| parent | f44336c594c7e7887ee43ece3b53ba68b827fd1d (diff) | |
| download | focaccia-qemu-01e7a53aed945adafc3ee54e2159227839daf0b4.tar.gz focaccia-qemu-01e7a53aed945adafc3ee54e2159227839daf0b4.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging
Diffstat (limited to 'hw/stellaris_enet.c')
| -rw-r--r-- | hw/stellaris_enet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index d5613ffffd..866c9a2381 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -406,7 +406,7 @@ static int stellaris_enet_init(SysBusDevice *dev) memory_region_init_io(&s->mmio, &stellaris_enet_ops, s, "stellaris_enet", 0x1000); - sysbus_init_mmio_region(dev, &s->mmio); + sysbus_init_mmio(dev, &s->mmio); sysbus_init_irq(dev, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); |