summaryrefslogtreecommitdiffstats
path: root/src/devices/cpu/mcs51/mcs51.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/mcs51/mcs51.cpp')
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp
index 6728729c11e..1dc0266f73f 100644
--- a/src/devices/cpu/mcs51/mcs51.cpp
+++ b/src/devices/cpu/mcs51/mcs51.cpp
@@ -131,11 +131,14 @@
*/
#include "emu.h"
-#include "debugger.h"
#include "mcs51.h"
#include "mcs51dasm.h"
#include "debugger.h"
+<<<<<<< HEAD
+=======
+#include "fileio.h"
+>>>>>>> parent of ea6d1ae3f4c (Revert "Remove fileio.h from emu.h")
#define VERBOSE 0