From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/devices/cpu/m68000/m68k_in.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/devices/cpu/m68000/m68k_in.cpp') 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; } -- cgit v1.2.3-70-g09d2