Merge remote-tracking branch 'upstream/master' into feature/ich2

This commit is contained in:
Jasmine Iwanek
2023-01-22 16:53:31 -05:00
30 changed files with 133 additions and 13 deletions

View File

@@ -10853,7 +10853,7 @@ const machine_t machines[] = {
.min_multi = 3.0,
.max_multi = 8.0
},
.bus_flags = MACHINE_PS2_PCI,
.bus_flags = MACHINE_PS2_AGP,
.flags = MACHINE_IDE_DUAL,
.ram = {
.min = 8192,