Changeset 3316 for trunk/src/host/qemu-neo1973/hw/integratorcp.c

Timestamp:

11/01/07 12:27:59 (6 years ago)

Author:

andrew

Message:

Merge with :ext:balrog@cvs.savannah.nongnu.org:/sources/qemu

File:

• trunk/src/host/qemu-neo1973/hw/integratorcp.c (modified) (1 diff)

trunk/src/host/qemu-neo1973/hw/integratorcp.c

@@ -463 +463 @@
 /* Board init.  */
 
-static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device,
-                     DisplayState *ds, const char **fd_filename, int snapshot,
+static void integratorcp_init(int ram_size, int vga_ram_size,
+                     const char *boot_device, DisplayState *ds,
+                     const char **fd_filename, int snapshot,
                      const char *kernel_filename, const char *kernel_cmdline,
                      const char *initrd_filename, const char *cpu_model)