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/ql/std.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/ql/std.cpp')
-rw-r--r-- | src/devices/bus/ql/std.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/bus/ql/std.cpp b/src/devices/bus/ql/std.cpp index b1171c46336..5e13a0ff32f 100644 --- a/src/devices/bus/ql/std.cpp +++ b/src/devices/bus/ql/std.cpp @@ -47,7 +47,7 @@ void ql_standard_rom_cartridge_device::device_start() // read - cartridge data read //------------------------------------------------- -uint8_t ql_standard_rom_cartridge_device::read(offs_t offset, uint8_t data) +uint8_t ql_standard_rom_cartridge_device::read(address_space &space, offs_t offset, uint8_t data) { if (m_romoeh && m_rom.bytes()) { |