From 4d969342a39e00ffafce847e557bf3d990d76741 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 14 Apr 2023 07:02:27 +1000 Subject: [PATCH] skeleton/freedom220.cpp: Fix bad merge. --- src/mame/skeleton/freedom220.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/skeleton/freedom220.cpp b/src/mame/skeleton/freedom220.cpp index 1050ad3c861..e12467f3e50 100644 --- a/src/mame/skeleton/freedom220.cpp +++ b/src/mame/skeleton/freedom220.cpp @@ -39,18 +39,19 @@ ****************************************************************************/ #include "emu.h" + #include "bus/rs232/rs232.h" #include "cpu/z80/z80.h" #include "machine/i8251.h" #include "machine/pit8253.h" #include "video/scn2674.h" + #include "emupal.h" #include "screen.h" namespace { - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -104,7 +105,6 @@ private: SCN2674_DRAW_CHARACTER_MEMBER(draw_character); void nmi_control_w(uint8_t data); - void nmi_w(int state); };