summaryrefslogtreecommitdiffstats
path: root/hw/mips_r4k.c
diff options
context:
space:
mode:
authorAnthony Liguori2011-09-26 15:00:40 +0200
committerAnthony Liguori2011-09-26 15:00:40 +0200
commit4c54661feb0437eab99186a0e462524e18592b9c (patch)
tree7e2c4969ac479ca13bfacbd569af3c08be103bad /hw/mips_r4k.c
parentMerge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging (diff)
parentfdc: Convert isabus_fdc_init1 to MemoryRegion (diff)
downloadqemu-4c54661feb0437eab99186a0e462524e18592b9c.tar.gz
qemu-4c54661feb0437eab99186a0e462524e18592b9c.tar.xz
qemu-4c54661feb0437eab99186a0e462524e18592b9c.zip
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/mips_r4k.c')
-rw-r--r--hw/mips_r4k.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 805d02a4eb..d0564d4449 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -256,8 +256,8 @@ void mips_r4k_init (ram_addr_t ram_size,
cpu_mips_clock_init(env);
/* The PIC is attached to the MIPS CPU INT0 pin */
+ isa_bus_new(NULL, get_system_io());
i8259 = i8259_init(env->irq[2]);
- isa_bus_new(NULL);
isa_bus_irqs(i8259);
rtc_init(2000, NULL);