diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-11-17 16:38:05 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-11-17 16:38:05 +0000 |
| commit | ab4dd33dc3127a3830591b597a1f42be3686e1fd (patch) | |
| tree | df00e3eb08af8c6da6745acf62d085e2cda5f028 /hw/vga.c | |
| parent | 83eeb39669a19716a44bcad5a34158543b3779b8 (diff) | |
| parent | c96c53b5f10c4b34e9fe1dcb1a5aadf204c16279 (diff) | |
Merge branch 'vga.1' of git://git.kraxel.org/qemu
* 'vga.1' of git://git.kraxel.org/qemu:
vga: fix mmio vga register mapping
vga: fix bochs alignment issue
Diffstat (limited to 'hw/vga.c')
| -rw-r--r-- | hw/vga.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -2321,9 +2321,8 @@ static const MemoryRegionPortio vbe_portio_list[] = { { 0, 1, 2, .read = vbe_ioport_read_index, .write = vbe_ioport_write_index }, # ifdef TARGET_I386 { 1, 1, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, -# else - { 2, 1, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, # endif + { 2, 1, 2, .read = vbe_ioport_read_data, .write = vbe_ioport_write_data }, PORTIO_END_OF_LIST(), }; |