Merge commit 'gnu/master' into test

[qemu] / hw / mips.h

diff --git a/hw/mips.h b/hw/mips.h
index 57448f9..5fd72bb 100644 (file)
--- a/hw/mips.h
+++ b/hw/mips.h
@@ -10,7 +10,7 @@ void *ds1225y_init(target_phys_addr_t mem_base, const char *filename);
 void ds1225y_set_protection(void *opaque, int protection);
 
 /* g364fb.c */
-int g364fb_mm_init(int vram_size, target_phys_addr_t vram_base,
+int g364fb_mm_init(target_phys_addr_t vram_base,
                    target_phys_addr_t ctrl_base, int it_shift,
                    qemu_irq irq);