summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/divideo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/divideo.cpp')
-rw-r--r--src/emu/divideo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/divideo.cpp b/src/emu/divideo.cpp
index 4abe607dab3..d0e68e36460 100644
--- a/src/emu/divideo.cpp
+++ b/src/emu/divideo.cpp
@@ -137,8 +137,8 @@ void device_video_interface::interface_pre_start()
// resolve the palette for the sake of register_screen_bitmap
m_screen->resolve_palette();
- // no other palette may be specified (FIXME: breaks meritm.cpp)
- if (0 && m_screen->has_palette() && palintf != &m_screen->palette())
+ // no other palette may be specified
+ if (m_screen->has_palette() && palintf != &m_screen->palette())
throw emu_fatalerror("Device '%s' cannot control screen '%s' with palette '%s'", device().tag(), m_screen_tag, m_screen->palette().device().tag());
}
}