diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:40 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:40 -0500 |
| commit | 4c54661feb0437eab99186a0e462524e18592b9c (patch) | |
| tree | 7e2c4969ac479ca13bfacbd569af3c08be103bad /hw/mips_r4k.c | |
| parent | 04970fd9339f75f5d21c094ab816a8e429dc1ff1 (diff) | |
| parent | 2f290a8c3db977056e4840810d0dd42032745f21 (diff) | |
| download | focaccia-qemu-4c54661feb0437eab99186a0e462524e18592b9c.tar.gz focaccia-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.c | 2 |
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); |