diff options
author | 2017-06-25 15:19:30 +1000 | |
---|---|---|
committer | 2017-06-25 15:19:30 +1000 | |
commit | 41e1555242eb78c68c653f93ae204ef9a317890b (patch) | |
tree | 4aa19c5f82f8956ef8c1e792f9b1c2f4cc6909c4 /src/devices/bus/coco/coco_multi.cpp | |
parent | 4c815ece23fa6f860a79abd094f3445b165a5171 (diff) | |
parent | f31e73505343e3fe9cf9539b559e594035c4d9cb (diff) |
Merge branch 'release0187'
Conflicts:
src/mame/drivers/accomm.cpp
Diffstat (limited to 'src/devices/bus/coco/coco_multi.cpp')
-rw-r--r-- | src/devices/bus/coco/coco_multi.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/bus/coco/coco_multi.cpp b/src/devices/bus/coco/coco_multi.cpp index 8e5c5a182c9..98c1cb96765 100644 --- a/src/devices/bus/coco/coco_multi.cpp +++ b/src/devices/bus/coco/coco_multi.cpp @@ -139,7 +139,7 @@ static SLOT_INTERFACE_START(coco_cart_slot1_3) SLOT_INTERFACE("rs232", COCO_RS232) SLOT_INTERFACE("dcmodem", COCO_DCMODEM) SLOT_INTERFACE("orch90", COCO_ORCH90) - SLOT_INTERFACE("ssc", COCO_SSC) MCFG_SLOT_OPTION_CLOCK("ssc", DERIVED_CLOCK(1, 1)) + SLOT_INTERFACE("ssc", COCO_SSC) MCFG_SLOT_OPTION_CLOCK("ssc", DERIVED_CLOCK(1, 1)) SLOT_INTERFACE("games_master", COCO_PAK_GMC) SLOT_INTERFACE("banked_16k", COCO_PAK_BANKED) SLOT_INTERFACE("pak", COCO_PAK) @@ -150,7 +150,7 @@ static SLOT_INTERFACE_START(coco_cart_slot4) SLOT_INTERFACE("rs232", COCO_RS232) SLOT_INTERFACE("dcmodem", COCO_DCMODEM) SLOT_INTERFACE("orch90", COCO_ORCH90) - SLOT_INTERFACE("ssc", COCO_SSC) MCFG_SLOT_OPTION_CLOCK("ssc", DERIVED_CLOCK(1, 1)) + SLOT_INTERFACE("ssc", COCO_SSC) MCFG_SLOT_OPTION_CLOCK("ssc", DERIVED_CLOCK(1, 1)) SLOT_INTERFACE("games_master", COCO_PAK_GMC) SLOT_INTERFACE("banked_16k", COCO_PAK_BANKED) SLOT_INTERFACE("pak", COCO_PAK) |