diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/emu/addrmap.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/emu/addrmap.cpp')
-rw-r--r-- | src/emu/addrmap.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp index 06410945815..0a2e7a15c98 100644 --- a/src/emu/addrmap.cpp +++ b/src/emu/addrmap.cpp @@ -759,12 +759,6 @@ address_map::address_map(device_t &device, int spacenum) memintf->get_addrmap(spacenum)(*this); m_device = &device; } - else - { - // if the owner didn't provide a map, use the default device map - if (!spaceconfig->m_default_map.isnull()) - spaceconfig->m_default_map(*this); - } // construct the internal device map (last so it takes priority) if (!spaceconfig->m_internal_map.isnull()) |