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/machine/68307.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/68307.h')
-rw-r--r-- | src/devices/machine/68307.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h index 6d5ef10b61c..591d0c9cced 100644 --- a/src/devices/machine/68307.h +++ b/src/devices/machine/68307.h @@ -44,8 +44,6 @@ protected: virtual uint32_t execute_min_cycles() const override { return 4; } virtual uint32_t execute_max_cycles() const override { return 158; } - virtual void m68k_reset_peripherals() override; - private: void set_ipl(int level); DECLARE_WRITE_LINE_MEMBER(timer0_interrupt); |