Merge branch 'stage7' into stage8

This commit is contained in:
Stefan Lankes 2015-01-18 20:43:17 +01:00
commit f220fc6d4b

View file

@ -312,7 +312,7 @@ int uart_init(void)
if (pci_get_device_info(0x1b36, 0x0003, iobase, &pci_info) == 0)
goto Lsuccess;
// Searching for Qemu's 4x UART device (pci-serial-4x)
if (pci_get_device_info(0x1b36, 0x0003, iobase, &pci_info) == 0)
if (pci_get_device_info(0x1b36, 0x0004, iobase, &pci_info) == 0)
goto Lsuccess;
return -1;