Merge remote-tracking branch 'aneesh/for-upstream' into staging

[mirror_qemu.git] / hw / serial.h

diff --git a/hw/serial.h b/hw/serial.h
index 55a1ac5e9b02008a958a773219ed90786c2f3713..ed1a5cd43e6e6e8f20ed1dd125ce7976b20372e7 100644 (file)
--- a/hw/serial.h
+++ b/hw/serial.h
@@ -89,9 +89,9 @@ void serial_set_frequency(SerialState *s, uint32_t frequency);
 
 /* legacy pre qom */
 SerialState *serial_init(int base, qemu_irq irq, int baudbase,
-                         CharDriverState *chr);
+                         CharDriverState *chr, MemoryRegion *system_io);
 SerialState *serial_mm_init(MemoryRegion *address_space,
-                            target_phys_addr_t base, int it_shift,
+                            hwaddr base, int it_shift,
                             qemu_irq irq, int baudbase,
                             CharDriverState *chr, enum device_endian end);