Merge branch 'master' into feature/mtrr

This commit is contained in:
Jasmine Iwanek
2022-08-21 17:08:47 -04:00
39 changed files with 1641 additions and 1101 deletions

View File

@@ -7389,7 +7389,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,