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/bus/a2bus/a2eramworks3.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/a2bus/a2eramworks3.h')
-rw-r--r-- | src/devices/bus/a2bus/a2eramworks3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h index d47d88c37d9..f2b327ebfab 100644 --- a/src/devices/bus/a2bus/a2eramworks3.h +++ b/src/devices/bus/a2bus/a2eramworks3.h @@ -36,7 +36,7 @@ protected: virtual uint8_t *get_vram_ptr() override; virtual uint8_t *get_auxbank_ptr() override; virtual bool allow_dhr() override { return true; } - virtual void write_c07x(uint8_t offset, uint8_t data) override; + virtual void write_c07x(address_space &space, uint8_t offset, uint8_t data) override; private: uint8_t m_ram[8*1024*1024]; |