diff options
Diffstat (limited to 'src/devices/machine/mc146818.cpp')
-rw-r--r-- | src/devices/machine/mc146818.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp index d0990b0606e..449c22ec252 100644 --- a/src/devices/machine/mc146818.cpp +++ b/src/devices/machine/mc146818.cpp @@ -12,7 +12,14 @@ *********************************************************************/ #include "emu.h" +<<<<<<< HEAD #include "coreutil.h" +======= +#include "machine/mc146818.h" +>>>>>>> parent of ea6d1ae3f4c (Revert "Remove fileio.h from emu.h") + +#include "coreutil.h" +#include "fileio.h" //#define VERBOSE 1 #include "logmacro.h" |