mirror of
https://github.com/holub/mame
synced 2025-04-25 01:40:16 +03:00
skeleton/freedom220.cpp: Fix bad merge.
This commit is contained in:
parent
7d26d641d3
commit
4d969342a3
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user