diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 14:28:13 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 14:28:13 +0000 |
| commit | 4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c (patch) | |
| tree | a764e6ea07f06acf51df4d62790cdf9ae922d55d /hw/serial.h | |
| parent | 475363176c80feedb8feb5e335ba64de68c7b055 (diff) | |
| parent | 582299336879504353e60c7937fbc70fea93f3da (diff) | |
| download | focaccia-qemu-4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c.tar.gz focaccia-qemu-4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c.zip | |
Merge branch 'memory-ioport' of git://github.com/afaerber/qemu-cpu
* 'memory-ioport' of git://github.com/afaerber/qemu-cpu: hw/dma.c: Replace register_ioport_* hw/pc.c: Replace register_ioport_* serial: Replace register_ioport_* hw/cirrus_vga.c: Replace register_ioport_* hw/apm.c: Replace register_ioport_* isa: Add isa_address_space_io()
Diffstat (limited to '')
| -rw-r--r-- | hw/serial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/serial.h b/hw/serial.h index f1e3c4aaa7..ed1a5cd43e 100644 --- a/hw/serial.h +++ b/hw/serial.h @@ -89,7 +89,7 @@ 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, hwaddr base, int it_shift, qemu_irq irq, int baudbase, |