Merge branch 'master' of https://github.com/86Box/86Box

2020-04-17 15:34:26 -03:00
parent e7d7528dd3 3e6994a11c
commit 2cf88a5011
11 changed files with 10 additions and 78 deletions
--- a/src/machine/m_at_socket7_s7.c
+++ b/src/machine/m_at_socket7_s7.c
@@ -575,7 +575,7 @@ machine_at_tx97_init(const machine_t *model)
    device_add(&i430tx_device);
    device_add(&piix4_device);
    device_add(&keyboard_ps2_pci_device);
-    device_add(&w83977tf_device);
+    device_add(&w83877tf_acorp_device);
    device_add(&intel_flash_bxt_device);

    hwm_values_t machine_hwm = {