Merge branch 'master' of github.com:OBattler/86Box into tc1995

2017-05-15 00:42:02 +02:00
parent 11b7ede678 6a3f3727a7
commit 9eb54d9b3e
8 changed files with 389 additions and 359 deletions
--- a/src/scsi_aha154x.c
+++ b/src/scsi_aha154x.c
@@ -27,6 +27,7 @@
 #include "io.h"
 #include "mca.h"
 #include "mem.h"
+#include "mca.h"
 #include "rom.h"
 #include "dma.h"
 #include "pic.h"