diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:24 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:48:24 -0500 |
| commit | 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d (patch) | |
| tree | fe43017f2bf431bc55a90b28e6c0e9357c4d46bd /hw/mips.h | |
| parent | 444dc48298c480e42e15a8fe676be737d8a6b2a1 (diff) | |
| parent | 2b90ca040c59d73943061e49f39455964e8af158 (diff) | |
| download | focaccia-qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.tar.gz focaccia-qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging
Diffstat (limited to 'hw/mips.h')
| -rw-r--r-- | hw/mips.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/mips.h b/hw/mips.h index cae5f4c804..97d7b9e5ad 100644 --- a/hw/mips.h +++ b/hw/mips.h @@ -2,6 +2,8 @@ #define HW_MIPS_H /* Definitions for mips board emulation. */ +#include "memory.h" + /* gt64xxx.c */ PCIBus *gt64120_register(qemu_irq *pic); @@ -9,7 +11,7 @@ PCIBus *gt64120_register(qemu_irq *pic); PCIBus *bonito_init(qemu_irq *pic); /* g364fb.c */ -int g364fb_mm_init(target_phys_addr_t vram_base, +int g364fb_mm_init(MemoryRegion *system_memory, target_phys_addr_t vram_base, target_phys_addr_t ctrl_base, int it_shift, qemu_irq irq); |