From 04bcf02bf549eed9f1ea4a87756d83f7fdb414ff Mon Sep 17 00:00:00 2001
From: Barry Harris <44396066+barry65536@users.noreply.github.com>
Date: Mon, 1 Apr 2013 10:08:56 +0000
Subject: [PATCH] Avoid rom merge conflicts (using MAME policy on renaming)

---
 src/burn/drv/capcom/d_cps1.cpp | 4 ++--
 src/burn/drv/capcom/d_cps2.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/burn/drv/capcom/d_cps1.cpp b/src/burn/drv/capcom/d_cps1.cpp
index 786238e51..87bf21be2 100644
--- a/src/burn/drv/capcom/d_cps1.cpp
+++ b/src/burn/drv/capcom/d_cps1.cpp
@@ -10024,7 +10024,7 @@ static struct BurnRomInfo Sf2ceuab5RomDesc[] = {
 	{ "15.bin",        0x080000, 0x8c08c9bd, BRF_OPT },
 	{ "23.bin",        0x080000, 0xf613febd, BRF_OPT },
 	{ "16.bin",        0x080000, 0xf23b588b, BRF_OPT },
-	{ "24.bin",        0x080000, 0xb4f16226, BRF_OPT },
+	{ "24(__sf2ceuab5).bin",        0x080000, 0xb4f16226, BRF_OPT },
 };
 
 STD_ROM_PICK(Sf2ceuab5)
@@ -10114,7 +10114,7 @@ static struct BurnRomInfo Sf2ceucblRomDesc[] = {
 	{ "15.bin",        0x080000, 0x8c08c9bd, BRF_OPT },
 	{ "23.bin",        0x080000, 0xf613febd, BRF_OPT },
 	{ "16.bin",        0x080000, 0xf23b588b, BRF_OPT },
-	{ "24.bin",        0x080000, 0xb4f16226, BRF_OPT },
+	{ "24(__sf2ceucbl).bin", 0x080000, 0xb4f16226, BRF_OPT },
 };
 
 STD_ROM_PICK(Sf2ceucbl)
diff --git a/src/burn/drv/capcom/d_cps2.cpp b/src/burn/drv/capcom/d_cps2.cpp
index 6754a157e..0ede4889d 100644
--- a/src/burn/drv/capcom/d_cps2.cpp
+++ b/src/burn/drv/capcom/d_cps2.cpp
@@ -10096,7 +10096,7 @@ static struct BurnRomInfo Hsf2daRomDesc[] = {
 	{ "hs2.01",        0x020000, 0xc1a13786, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG },
 	{ "hs2.02",        0x020000, 0x2d8794aa, CPS2_PRG_Z80 | BRF_ESS | BRF_PRG },
 
-	{ "hs2.11m",       0x400000, 0x5cb00496, CPS2_QSND | BRF_SND },
+	{ "hs2(__hsf2da).11m", 0x400000, 0x5cb00496, CPS2_QSND | BRF_SND },
 	{ "hs2.12m",       0x400000, 0x8f298007, CPS2_QSND | BRF_SND },
 };