fix compile. (nw)

src/mame/drivers/ampoker2.cpp

@@ -1186,7 +1186,7 @@ MACHINE_CONFIG_START(ampoker2_state::sigma2k)
 	/* video hardware */
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_sigma2k)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_sigma2k, this));
-
+MACHINE_CONFIG_END
 
 /*************************
 *        Rom Load        *

src/mame/drivers/firetrk.cpp

@@ -918,13 +918,8 @@ MACHINE_CONFIG_START(firetrk_state::montecar)
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(firetrk_state, screen_update_montecar)
 
-<<<<<<< HEAD
-	MCFG_VIDEO_START_OVERRIDE(firetrk_state,montecar)
-	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_montecar)
-=======
 	set_video_start_cb(config, driver_callback_delegate(&video_start_montecar, this));
-	MCFG_GFXDECODE_MODIFY("gfxdecode", montecar)
+	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_montecar)
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 
 	MCFG_PALETTE_MODIFY("palette")
 	MCFG_PALETTE_ENTRIES(46)

src/mame/drivers/konamigx.cpp

@@ -1802,13 +1802,8 @@ MACHINE_CONFIG_START(konamigx_state::racinfrc)
 	//MCFG_SCREEN_RAW_PARAMS(6000000, 384+24+64+40, 0, 383, 224+16+8+16, 0, 223)
 	//MCFG_SCREEN_VISIBLE_AREA(32, 32+384-1, 16, 16+224-1)
 
-<<<<<<< HEAD
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_racinfrc)
-	MCFG_VIDEO_START_OVERRIDE(konamigx_state, racinfrc)
-=======
-	MCFG_GFXDECODE_ADD("gfxdecode", "palette", racinfrc)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_racinfrc, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 
 	MCFG_DEVICE_MODIFY("k053252")
 	MCFG_K053252_OFFSETS(24-8+16, 0)
@@ -1835,13 +1830,8 @@ MACHINE_CONFIG_START(konamigx_state::gxtype3)
 
 	MCFG_DEFAULT_LAYOUT(layout_dualhsxs)
 
-<<<<<<< HEAD
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_type3)
-	MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type3)
-=======
-	MCFG_GFXDECODE_ADD("gfxdecode", "palette", type3)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_konamigx_type3, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 
 	MCFG_DEVICE_MODIFY("k053252")
 	MCFG_K053252_OFFSETS(0, 16)
@@ -1899,13 +1889,8 @@ MACHINE_CONFIG_START(konamigx_state::gxtype4)
 	MCFG_PALETTE_ENABLE_SHADOWS()
 	MCFG_PALETTE_ENABLE_HILIGHTS()
 
-<<<<<<< HEAD
 	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_type4)
-	MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type4)
-=======
-	MCFG_GFXDECODE_ADD("gfxdecode", "palette", type4)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_konamigx_type4, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 
 	MCFG_DEVICE_MODIFY("k053252")
 	MCFG_K053252_OFFSETS(0, 16)

src/mame/drivers/nmk16.cpp

@@ -5229,13 +5229,8 @@ MACHINE_CONFIG_START(nmk16_state::grdnstrmk) /* Side by side with PCB, the music
 	/* video hardware */
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_REFRESH_RATE(57) /* Side by side with PCB, MAME is too fast at 56 */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_grdnstrm)
-	MCFG_VIDEO_START_OVERRIDE(nmk16_state,grdnstrm)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", grdnstrm)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_grdnstrm, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(nmk16_state::popspops)

src/mame/drivers/ssv.cpp

@@ -2838,13 +2838,8 @@ MACHINE_CONFIG_START(ssv_state::eaglshot)
 	MCFG_SCREEN_VISIBLE_AREA(0, (0xca - 0x2a)*2-1, 0, (0xf6 - 0x16)-1)
 	MCFG_SCREEN_UPDATE_DRIVER(ssv_state, screen_update_eaglshot)
 
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_eaglshot)
-	MCFG_VIDEO_START_OVERRIDE(ssv_state,eaglshot)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", eaglshot)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_eaglshot, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 MACHINE_CONFIG_END
 
 

src/mame/drivers/taito_f2.cpp

@@ -2971,13 +2971,8 @@ MACHINE_CONFIG_START(taitof2_state::dondokod)
 	MCFG_DEVICE_PROGRAM_MAP(dondokod_map)
 
 	/* video hardware */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot)
-	MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dondokod)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", pivot)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_dondokod, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed))
 	MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz)
@@ -3034,13 +3029,8 @@ MACHINE_CONFIG_START(taitof2_state::thundfox)
 	MCFG_DEVICE_PROGRAM_MAP(thundfox_map)
 
 	/* video hardware */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_thundfox)
-	MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_thundfox)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", thundfox)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_thundfox, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_thundfox)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_partial_buffer_delayed_thundfox))
@@ -3077,13 +3067,8 @@ MACHINE_CONFIG_START(taitof2_state::cameltry)
 	MCFG_DEVICE_PROGRAM_MAP(cameltry_map)
 
 	/* video hardware */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot)
-	MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_dondokod)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", pivot)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_dondokod, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz)
 
@@ -3279,13 +3264,8 @@ MACHINE_CONFIG_START(taitof2_state::footchmp)
 	MCFG_DEVICE_PROGRAM_MAP(footchmp_map)
 
 	/* video hardware */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx)
-	MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_footchmp)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_footchmp, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_full_buffer_delayed))
@@ -3317,13 +3297,8 @@ MACHINE_CONFIG_START(taitof2_state::hthero)
 	MCFG_DEVICE_PROGRAM_MAP(footchmp_map)
 
 	/* video hardware */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx)
-	MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_hthero)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_hthero, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx)
 	MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, taitof2_state, screen_vblank_full_buffer_delayed))
@@ -3378,13 +3353,8 @@ MACHINE_CONFIG_START(taitof2_state::yuyugogo)
 	MCFG_PALETTE_FORMAT(RRRRGGGGBBBBxxxx)
 
 	/* video hardware */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_yuyugogo)
-	MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_yuyugogo)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", yuyugogo)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_yuyugogo, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_yesnoj)
 
@@ -3482,13 +3452,8 @@ MACHINE_CONFIG_START(taitof2_state::pulirula)
 	MCFG_DEVICE_PROGRAM_MAP(pulirula_map)
 
 	/* video hardware */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_pivot)
-	MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_pulirula)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", pivot)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_pulirula, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_pri_roz)
 
@@ -3623,13 +3588,8 @@ MACHINE_CONFIG_START(taitof2_state::deadconxj)
 	MCFG_DEVICE_PROGRAM_MAP(deadconx_map)
 
 	/* video hardware */
-<<<<<<< HEAD
 	MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_deadconx)
-	MCFG_VIDEO_START_OVERRIDE(taitof2_state,taitof2_deadconxj)
-=======
-	MCFG_GFXDECODE_MODIFY("gfxdecode", deadconx)
 	set_video_start_cb(config, driver_callback_delegate(&video_start_taitof2_deadconxj, this));
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_SCREEN_MODIFY("screen")
 	MCFG_SCREEN_UPDATE_DRIVER(taitof2_state, screen_update_taitof2_deadconx)
 

src/mame/drivers/tetrisp2.cpp

@@ -1994,13 +1994,8 @@ MACHINE_CONFIG_START(stepstag_state::vjdash)    // 4 Screens
 	MCFG_SCREEN_UPDATE_DRIVER(stepstag_state, screen_update_stepstag_right)
 	MCFG_SCREEN_PALETTE("rpalette")
 
-<<<<<<< HEAD
-	MCFG_VIDEO_START_OVERRIDE(stepstag_state, stepstag )
-	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2)
-=======
 	set_video_start_cb(config, driver_callback_delegate(&video_start_stepstag, this));
-	MCFG_GFXDECODE_ADD("gfxdecode", "palette", tetrisp2)
+	MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tetrisp2)
->>>>>>> - Removed MACHINE/SOUND/VIDEO _START/_RESET macros. This has the side effect of making machine-config overrides of these much
 	MCFG_PALETTE_ADD("palette", 0x8000)
 
 	MCFG_DEVICE_ADD("gfxdecode_l", GFXDECODE, "lpalette", gfx_vj_lscreen)