diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-02 21:59:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-02 21:59:25 +0000 |
| commit | 20f089d31dd63e7c3c5c1ba858b7329ee6e3f192 (patch) | |
| tree | de0930bb5a179ac4919db1f67f6ff9cdc5a5db2d | |
| parent | 3c1ae75c85742e959db56e31a572ee43bcc73392 (diff) | |
| parent | d0b9e0423b07caccf269d78320ec86d864a5b6b2 (diff) | |
| download | qemu-snap-temp-L83600000952889167.tar.gz | |
Merge "Revert "Fixed error: qemu: unsupported keyboard cmd=0x84"" into snap-temp-L83600000952889167snap-temp-L83600000952889167
| -rw-r--r-- | hw/i386/pc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e18de48a31..8583c33434 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1664,10 +1664,9 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, } i8257_dma_init(isa_bus, 0); -#ifndef CONFIG_ANDROID + /* Super I/O */ pc_superio_init(isa_bus, create_fdctrl, no_vmport); -#endif } void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus) |