diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/cpu/m68000/m68k_in.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/cpu/m68000/m68k_in.cpp')
-rw-r--r-- | src/devices/cpu/m68000/m68k_in.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/devices/cpu/m68000/m68k_in.cpp b/src/devices/cpu/m68000/m68k_in.cpp index 0eed7fbe629..b5751811530 100644 --- a/src/devices/cpu/m68000/m68k_in.cpp +++ b/src/devices/cpu/m68000/m68k_in.cpp @@ -8286,7 +8286,6 @@ M68KMAKE_OP(reset, 0, ., .) { if (!m_reset_instr_callback.isnull()) (m_reset_instr_callback)(1); - m68k_reset_peripherals(); m_remaining_cycles -= m_cyc_reset; return; } |