Merge branch 'master' into feature/machine_z150

2026-03-02 10:48:24 -07:00 · 2022-08-15 21:22:37 -04:00
parent 35ec19b285 5ae9df6d07
commit be6e96b6d3
17 changed files with 77 additions and 23 deletions
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -7423,7 +7423,7 @@ const machine_t machines[] = {
            .min_multi = 1.5,
            .max_multi = 1.5
        },
-        .bus_flags = MACHINE_PS2_PCI,
+        .bus_flags = MACHINE_PCI,
        .flags = MACHINE_IDE_DUAL,
        .ram = {
            .min = 2048,