summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-12-27 23:20:05 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-12-27 23:20:05 +0000
commit86a9e3e217d5b4d841cf6b394994f4be647b7bf5 (patch)
tree12d603fec32965e3a455e945238964e5d2b928e3 /src
parent4717d53cac10b9d627d804e3461415274990e4bd (diff)
Rename eepromdev.c/h back to eeprom.c/h
Diffstat (limited to 'src')
-rw-r--r--src/emu/debug/debugcpu.c2
-rw-r--r--src/emu/emu.mak2
-rw-r--r--src/emu/machine/eeprom.c (renamed from src/emu/machine/eepromdev.c)2
-rw-r--r--src/emu/machine/eeprom.h (renamed from src/emu/machine/eepromdev.h)0
-rw-r--r--src/mame/drivers/20pacgal.c2
-rw-r--r--src/mame/drivers/39in1.c2
-rw-r--r--src/mame/drivers/albazg.c2
-rw-r--r--src/mame/drivers/asterix.c2
-rw-r--r--src/mame/drivers/astrocorp.c2
-rw-r--r--src/mame/drivers/ataxx.c2
-rw-r--r--src/mame/drivers/backfire.c2
-rw-r--r--src/mame/drivers/cave.c2
-rw-r--r--src/mame/drivers/cbasebal.c2
-rw-r--r--src/mame/drivers/cps1.c2
-rw-r--r--src/mame/drivers/cps2.c2
-rw-r--r--src/mame/drivers/darkhors.c2
-rw-r--r--src/mame/drivers/dcheese.c2
-rw-r--r--src/mame/drivers/deco156.c2
-rw-r--r--src/mame/drivers/deco32.c2
-rw-r--r--src/mame/drivers/deco_mlc.c2
-rw-r--r--src/mame/drivers/eolith.c2
-rw-r--r--src/mame/drivers/eolith16.c2
-rw-r--r--src/mame/drivers/esd16.c2
-rw-r--r--src/mame/drivers/f-32.c2
-rw-r--r--src/mame/drivers/fortecar.c2
-rw-r--r--src/mame/drivers/fromanc2.c2
-rw-r--r--src/mame/drivers/gaelco2.c2
-rw-r--r--src/mame/drivers/gaelco3d.c2
-rw-r--r--src/mame/drivers/galastrm.c2
-rw-r--r--src/mame/drivers/galpani2.c2
-rw-r--r--src/mame/drivers/gijoe.c2
-rw-r--r--src/mame/drivers/groundfx.c2
-rw-r--r--src/mame/drivers/gticlub.c2
-rw-r--r--src/mame/drivers/gunbustr.c2
-rw-r--r--src/mame/drivers/hornet.c2
-rw-r--r--src/mame/drivers/inufuku.c2
-rw-r--r--src/mame/drivers/jackpool.c2
-rw-r--r--src/mame/drivers/kaneko16.c2
-rw-r--r--src/mame/drivers/kickgoal.c2
-rw-r--r--src/mame/drivers/konamigq.c2
-rw-r--r--src/mame/drivers/konamigv.c2
-rw-r--r--src/mame/drivers/konamigx.c2
-rw-r--r--src/mame/drivers/leland.c2
-rw-r--r--src/mame/drivers/lethal.c2
-rw-r--r--src/mame/drivers/limenko.c2
-rw-r--r--src/mame/drivers/lordgun.c2
-rw-r--r--src/mame/drivers/metro.c2
-rw-r--r--src/mame/drivers/midas.c2
-rw-r--r--src/mame/drivers/mitchell.c2
-rw-r--r--src/mame/drivers/model2.c2
-rw-r--r--src/mame/drivers/model3.c2
-rw-r--r--src/mame/drivers/moo.c2
-rw-r--r--src/mame/drivers/mystwarr.c2
-rw-r--r--src/mame/drivers/naomi.c2
-rw-r--r--src/mame/drivers/othunder.c2
-rw-r--r--src/mame/drivers/overdriv.c2
-rw-r--r--src/mame/drivers/pasha2.c2
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/playmark.c2
-rw-r--r--src/mame/drivers/plygonet.c2
-rw-r--r--src/mame/drivers/pntnpuzl.c2
-rw-r--r--src/mame/drivers/policetr.c2
-rw-r--r--src/mame/drivers/powerbal.c2
-rw-r--r--src/mame/drivers/psikyo4.c2
-rw-r--r--src/mame/drivers/psikyosh.c2
-rw-r--r--src/mame/drivers/pzletime.c2
-rw-r--r--src/mame/drivers/rabbit.c2
-rw-r--r--src/mame/drivers/raiden2.c2
-rw-r--r--src/mame/drivers/rbmk.c2
-rw-r--r--src/mame/drivers/rungun.c2
-rw-r--r--src/mame/drivers/segas32.c2
-rw-r--r--src/mame/drivers/seibuspi.c2
-rw-r--r--src/mame/drivers/seta2.c2
-rw-r--r--src/mame/drivers/simpl156.c2
-rw-r--r--src/mame/drivers/simpsons.c2
-rw-r--r--src/mame/drivers/spool99.c2
-rw-r--r--src/mame/drivers/ssv.c2
-rw-r--r--src/mame/drivers/stlforce.c2
-rw-r--r--src/mame/drivers/stv.c2
-rw-r--r--src/mame/drivers/superchs.c2
-rw-r--r--src/mame/drivers/taito_b.c2
-rw-r--r--src/mame/drivers/taito_f3.c2
-rw-r--r--src/mame/drivers/taito_z.c2
-rw-r--r--src/mame/drivers/taitojc.c2
-rw-r--r--src/mame/drivers/tecmosys.c2
-rw-r--r--src/mame/drivers/tmaster.c2
-rw-r--r--src/mame/drivers/tmmjprd.c2
-rw-r--r--src/mame/drivers/tmnt.c2
-rw-r--r--src/mame/drivers/toaplan2.c2
-rw-r--r--src/mame/drivers/ultrsprt.c2
-rw-r--r--src/mame/drivers/undrfire.c2
-rw-r--r--src/mame/drivers/unico.c2
-rw-r--r--src/mame/drivers/vamphalf.c2
-rw-r--r--src/mame/drivers/vendetta.c2
-rw-r--r--src/mame/drivers/xexex.c2
-rw-r--r--src/mame/drivers/xmen.c2
-rw-r--r--src/mame/drivers/xorworld.c2
-rw-r--r--src/mame/drivers/zr107.c2
-rw-r--r--src/mame/machine/decoprot.c2
-rw-r--r--src/mame/machine/gaelco2.c2
-rw-r--r--src/mame/machine/kaneko16.c2
-rw-r--r--src/mame/machine/leland.c2
-rw-r--r--src/mame/machine/simpsons.c2
103 files changed, 102 insertions, 102 deletions
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 65b7e890b9b..eae47c3adde 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -25,7 +25,7 @@
#include "debugvw.h"
#include "debugger.h"
#include "uiinput.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include <ctype.h>
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 79b1d120d1c..f504f3f3684 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -132,7 +132,7 @@ EMUMACHINEOBJS = \
$(EMUMACHINE)/ds1302.o \
$(EMUMACHINE)/ds2401.o \
$(EMUMACHINE)/ds2404.o \
- $(EMUMACHINE)/eepromdev.o \
+ $(EMUMACHINE)/eeprom.o \
$(EMUMACHINE)/f3853.o \
$(EMUMACHINE)/generic.o \
$(EMUMACHINE)/i8243.o \
diff --git a/src/emu/machine/eepromdev.c b/src/emu/machine/eeprom.c
index 12fd96b940c..fea2ab0deeb 100644
--- a/src/emu/machine/eepromdev.c
+++ b/src/emu/machine/eeprom.c
@@ -4,7 +4,7 @@
*/
#include "driver.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#define VERBOSE 0
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
diff --git a/src/emu/machine/eepromdev.h b/src/emu/machine/eeprom.h
index 740f26ca6bd..740f26ca6bd 100644
--- a/src/emu/machine/eepromdev.h
+++ b/src/emu/machine/eeprom.h
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 186b34cd450..8c6621ae0bf 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -37,7 +37,7 @@
#include "driver.h"
#include "cpu/z180/z180.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/namco.h"
#include "sound/dac.h"
#include "includes/20pacgal.h"
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index b996662a08a..e01fa208329 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -24,7 +24,7 @@
#include "video/generic.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/pxa255.h"
#include "sound/dmadac.h"
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index 218524870f0..5f1c16f7722 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -55,7 +55,7 @@ Code disassembling
#include "driver.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index c7fe52c7958..8b3f642ef86 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -12,7 +12,7 @@ colour, including the word "Konami"
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2151intf.h"
#include "sound/k053260.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 83bc79a62a7..e9785054d18 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -13,7 +13,7 @@ OTHER: ASTRO 0001B, EEPROM
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
typedef struct _astrocrp_state astrocrp_state;
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 46462967994..683e1b1fc14 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -27,7 +27,7 @@
#include "driver.h"
#include "cpu/i86/i86.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/z80/z80.h"
#include "includes/leland.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 0d05d622c8a..d6f0c0cb5fd 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -14,7 +14,7 @@
#include "driver.h"
#include "includes/decocrpt.h"
#include "includes/deco32.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "sound/ymz280b.h"
#include "cpu/arm/arm.h"
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 219598fa38b..119adb202bf 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -70,7 +70,7 @@ Versions known to exist but not dumped:
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/nmk112.h"
#include "cpu/z80/z80.h"
#include "includes/cave.h"
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 455325de020..01bfb446540 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -16,7 +16,7 @@
#include "cpu/z80/z80.h"
#include "includes/cps1.h" // needed for decoding functions only
#include "includes/cbasebal.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 85bfbf7ab6a..c3300311dcd 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -233,7 +233,7 @@ Stephh's log (2006.09.20) :
#include "cpu/z80/z80.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2151intf.h"
#include "sound/okim6295.h"
#include "sound/qsound.h"
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 154b5db685e..7c731e08090 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -586,7 +586,7 @@ Stephh's inputs notes (based on some tests on the "parent" set) :
#include "driver.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/m68000/m68000.h"
#include "sound/qsound.h"
#include "sound/okim6295.h" // gigamn2 bootleg
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 948ab80f83e..2447ecdcb0d 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -57,7 +57,7 @@ To do:
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "sound/st0016.h"
#include "includes/st0016.h"
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index a767861824c..2437c1b13f1 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -31,7 +31,7 @@
#include "driver.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/ticket.h"
#include "sound/bsmt2000.h"
#include "includes/dcheese.h"
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 7126f93889b..f55bd7f7a04 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -16,7 +16,7 @@
#include "driver.h"
#include "includes/decocrpt.h"
#include "includes/deco32.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "sound/ymz280b.h"
#include "cpu/arm/arm.h"
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index a01ad494e54..2c659ccd969 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -231,7 +231,7 @@ Notes:
#include "cpu/m6809/m6809.h"
#include "includes/decocrpt.h"
#include "includes/decoprot.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/deco32.h"
#include "sound/2151intf.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index bd9cf7d6ad4..82f7a7ace0c 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -97,7 +97,7 @@
#include "driver.h"
#include "includes/decocrpt.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/ymz280b.h"
#include "includes/decoprot.h"
#include "cpu/arm/arm.h"
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 761a316b951..c137bf842c0 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -54,7 +54,7 @@
#include "driver.h"
#include "cpu/e132xs/e132xs.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
READ32_HANDLER(eolith_vram_r);
WRITE32_HANDLER(eolith_vram_w);
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index e293e89c6ac..c4fff378abe 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -12,7 +12,7 @@
#include "driver.h"
#include "cpu/e132xs/e132xs.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "includes/eolithsp.h"
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index d1ac702d356..a97e6ecb16e 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -44,7 +44,7 @@ Head Panic
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "sound/3812intf.h"
#include "includes/esd16.h"
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index 888750fc8bb..9a9722fa50e 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -13,7 +13,7 @@
#include "driver.h"
#include "cpu/e132xs/e132xs.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2151intf.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index cfdae55adbb..da1fbb4444c 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -26,7 +26,7 @@ dip 1X8
#include "driver.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/ay8910.h"
#include "machine/8255ppi.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 798d1efd478..b0e9d541db1 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -19,7 +19,7 @@
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2610intf.h"
#include "rendlay.h"
#include "includes/fromanc2.h"
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index 5309d90dbff..4c3bb4f6352 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -22,7 +22,7 @@
#include "driver.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/gaelco.h"
#include "rendlay.h"
#include "includes/gaelco2.h"
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 756abcb8d6a..d7b0e5d431b 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -147,7 +147,7 @@ REF. 970429
#include "includes/gaelco3d.h"
#include "cpu/tms32031/tms32031.h"
#include "cpu/adsp2100/adsp2100.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/dmadac.h"
#define LOG 0
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index 5098e0c799a..f67945179ae 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -41,7 +41,7 @@ $305.b invincibility
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
#include "audio/taitosnd.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/es5506.h"
#include "includes/taito_f3.h"
#include "audio/taito_en.h"
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index eb8bd0c9922..8e2d02ce6e6 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -22,7 +22,7 @@ To Do:
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/kaneko16.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index fd77332d5fc..a82d72b441a 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -40,7 +40,7 @@ Known Issues
#include "cpu/m68000/m68000.h"
#include "video/konicdev.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/k054539.h"
#include "includes/konamipt.h"
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index 9616763f3a6..aaa3f102d73 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -65,7 +65,7 @@
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/es5506.h"
#include "includes/taito_f3.h"
#include "audio/taito_en.h"
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index a5aa26321c4..de1d676c001 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -220,7 +220,7 @@ Hang Pilot (uses an unknown but similar video board) 12W
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/powerpc/ppc.h"
#include "cpu/sharc/sharc.h"
#include "machine/konppc.h"
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index c9df35122af..8e67f7f9573 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -48,7 +48,7 @@
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
#include "audio/taitosnd.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/es5506.h"
#include "includes/taito_f3.h"
#include "audio/taito_en.h"
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index 86425ae4936..f77948cc336 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -311,7 +311,7 @@
#include "cpu/m68000/m68000.h"
#include "cpu/powerpc/ppc.h"
#include "cpu/sharc/sharc.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/konppc.h"
#include "video/voodoo.h"
#include "machine/timekpr.h"
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 066df8adb9c..fa155b67a2e 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -70,7 +70,7 @@ TODO:
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2610intf.h"
#include "includes/inufuku.h"
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index e4fb72666b8..fc9b028d825 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -18,7 +18,7 @@ TODO:
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
static UINT16 *jackpool_vram;
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index f41cfb22bce..982750dea1f 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -87,7 +87,7 @@ Dip locations verified from manual for:
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/kaneko16.h"
#include "sound/2203intf.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 3cec3d5c1ab..7b056b47ab1 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -37,7 +37,7 @@ lev 7 : 0x7c : 0000 0000 - x
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "cpu/pic16c5x/pic16c5x.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "includes/kickgoal.h"
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index d738591d098..dd9b8728559 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -50,7 +50,7 @@
#include "cpu/mips/psx.h"
#include "includes/psx.h"
#include "includes/konamigx.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/am53cf96.h"
#include "harddisk.h"
#include "sound/k054539.h"
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 430ea05c872..58a4ced67fb 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -116,7 +116,7 @@ Notes:
#include "cdrom.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/intelfsh.h"
#include "machine/am53cf96.h"
#include "sound/psx.h"
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 749a28391a5..032160bdea1 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -101,7 +101,7 @@
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "cpu/tms57002/tms57002.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/k054539.h"
#include "includes/konamigx.h"
#include "machine/adc083x.h"
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index 0e81c45ec40..ed9969551a0 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -43,7 +43,7 @@
#include "driver.h"
#include "cpu/i86/i86.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/z80/z80.h"
#include "includes/leland.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 67c38bc342f..22412ad9b08 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -169,7 +169,7 @@ maybe some priority issues / sprite placement issues..
#include "cpu/m6809/m6809.h"
#include "cpu/hd6309/hd6309.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/k054539.h"
#define MAIN_CLOCK XTAL_24MHz
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 476cd06eeab..6fcd4f6dee8 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -25,7 +25,7 @@
#include "driver.h"
#include "cpu/e132xs/e132xs.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 09c7bfe1332..9a5b9c7a30c 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -30,7 +30,7 @@ To do:
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "machine/8255ppi.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
#include "includes/lordgun.h"
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index c99a7fc8afb..f71999322cc 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -86,7 +86,7 @@ driver modified by Eisuke Watanabe
#include "cpu/m68000/m68000.h"
#include "cpu/h83002/h8.h"
#include "cpu/upd7810/upd7810.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "video/konicdev.h"
#include "sound/2610intf.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index e99fc2f6563..6d4396b3fc5 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -48,7 +48,7 @@
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "sound/ymz280b.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#define MIDAS_DEBUG 0
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 63f22bf5f5e..73f09bbbebb 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -74,7 +74,7 @@ mw-9.rom = ST M27C1001 / GFX
#include "driver.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/cps1.h" // needed for decoding functions only
#include "includes/mitchell.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 8b2d468ee11..ab45b6dbf21 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -50,7 +50,7 @@
#include "driver.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "video/segaic24.h"
#include "cpu/i960/i960.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 72c8c06e361..34103da0641 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -601,7 +601,7 @@ ALL VROM ROMs are 16M MASK
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "cpu/powerpc/ppc.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/53c810.h"
#include "sound/scsp.h"
#include "includes/model3.h"
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index b53415b133f..0ee229b6c06 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -44,7 +44,7 @@ Bucky:
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2151intf.h"
#include "sound/okim6295.h"
#include "sound/k054539.h"
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index f9d1c61189e..0b23ef4a055 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -28,7 +28,7 @@
#include "includes/konamigx.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/k054539.h"
#include "includes/konamipt.h"
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 34706b7c853..e8b5c0ce836 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -1047,7 +1047,7 @@ Notes:
#include "driver.h"
#include "cpu/arm7/arm7.h"
#include "video/generic.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/intelfsh.h"
#include "includes/naomibd.h"
#include "includes/naomi.h"
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 39e712676a8..6a35415720d 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -234,7 +234,7 @@ TODO:
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "video/taitoic.h"
#include "machine/taitoio.h"
#include "audio/taitosnd.h"
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 2ecda12d14d..318c60ca06e 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -22,7 +22,7 @@ Notes:
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "video/konicdev.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/m6809/m6809.h"
#include "sound/2151intf.h"
#include "sound/k053260.h"
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 4d0d29c4237..60d8ce7fbcb 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -73,7 +73,7 @@ Notes:
#include "driver.h"
#include "cpu/e132xs/e132xs.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
static UINT16 *bitmap0, *bitmap1, *wram;
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index c988e5b75e1..e5373999074 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -89,7 +89,7 @@ Notes:
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
extern UINT16 *pirates_tx_tileram, *pirates_spriteram;
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 92a3e0547af..ddf068efa63 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -41,7 +41,7 @@ TODO:
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "sound/okim6295.h"
#include "includes/playmark.h"
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 8ce70504c73..d0f7746d559 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -85,7 +85,7 @@
#include "cpu/z80/z80.h"
#include "cpu/dsp56k/dsp56k.h"
#include "sound/k054539.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
VIDEO_START( polygonet );
VIDEO_UPDATE( polygonet );
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index 5e315762586..daee699b078 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -122,7 +122,7 @@ CN1 standard DB15 VGA connector (15KHz)
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
static const eeprom_interface eeprom_intf =
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 8a9d288eb4c..48cd4f309e5 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -85,7 +85,7 @@ PC5380-9651 5380-JY3306A 5380-N1045503A
#include "driver.h"
#include "cpu/mips/r3000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/policetr.h"
#include "sound/bsmt2000.h"
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 764a61b746d..08dfecd8ca1 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -15,7 +15,7 @@ Magic Sticks:
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "includes/playmark.h"
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index b2acddf366f..c26fb4e12d4 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -129,7 +129,7 @@ ROMs -
#include "driver.h"
#include "cpu/sh2/sh2.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/ymf278b.h"
#include "rendlay.h"
#include "includes/psikyo4.h"
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 0cc4d1ef9c7..1ff367bec35 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -272,7 +272,7 @@ Notes:
#include "driver.h"
#include "cpu/sh2/sh2.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/ymf278b.h"
#include "includes/psikyosh.h"
diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c
index 1447fa3a120..e065ef50d8a 100644
--- a/src/mame/drivers/pzletime.c
+++ b/src/mame/drivers/pzletime.c
@@ -17,7 +17,7 @@
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
static UINT16 *bg_videoram, *mid_videoram, *txt_videoram, *tilemap_regs, *video_regs;
static tilemap *mid_tilemap, *txt_tilemap;
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 759ec8a8932..3746340d884 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -79,7 +79,7 @@ Custom: Imagetek 15000 (2ch video & 2ch sound)
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#define VERBOSE_AUDIO_LOG (0) // enable to show audio writes (very noisy when music is playing)
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 635d6ee7673..cee045a149a 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -139,7 +139,7 @@ Current Problem(s) - in order of priority
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
#include "audio/seibu.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "machine/seicop.h"
#include "includes/raiden2.h"
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index 7fb60aa5a84..c652edf0709 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -52,7 +52,7 @@ Notes:
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
static UINT16 *gms_vidram;
static UINT16 *gms_vidram2;
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index 4235bffa7a8..384e18a4c47 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -40,7 +40,7 @@
#include "video/konicdev.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/k054539.h"
#include "includes/konamipt.h"
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 5fc81982574..1f094f6d189 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -320,7 +320,7 @@ MIB.42
#include "cpu/nec/nec.h"
#include "rendlay.h"
#include "includes/segas32.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2612intf.h"
#include "sound/rf5c68.h"
#include "sound/multipcm.h"
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 53d55525ac9..ad2afaca494 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -737,7 +737,7 @@ Notes:
#include "cpu/z80/z80.h"
#include "cpu/i386/i386.h"
#include "machine/ds2404.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/intelfsh.h"
#include "sound/okim6295.h"
#include "sound/ymf271.h"
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index c768453313b..1b8ce1dfb68 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -533,7 +533,7 @@ The same H8/3007 code "FC21 IOPR-0" at U49 is used for FUNCUBE 2,3,4 & 5
#include "cpu/m68000/m68000.h"
#include "machine/tmp68301.h"
#include "cpu/h83002/h8.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/x1_010.h"
#include "includes/seta.h"
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index 1b6d8a9696f..18a33afac2d 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -92,7 +92,7 @@ Are the OKI M6295 clocks from Heavy Smash are correct at least for the Mitchell
#include "includes/decocrpt.h"
#include "includes/deco32.h"
#include "cpu/arm/arm.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
#include "includes/deco16ic.h"
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index 237585355bb..25de121bda1 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -70,7 +70,7 @@ Custom ICs - 053260 - sound chip (QFP80)
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
#include "cpu/z80/z80.h"
#include "video/konicdev.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2151intf.h"
#include "sound/k053260.h"
#include "includes/simpsons.h"
diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c
index 64068ea6fbe..45d84546757 100644
--- a/src/mame/drivers/spool99.c
+++ b/src/mame/drivers/spool99.c
@@ -90,7 +90,7 @@ Note
#include "driver.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
static UINT8 *spool99_main;
static tilemap *sc0_tilemap;
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 930948d1765..335813d7b7f 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -183,7 +183,7 @@ Notes:
#include "cpu/v810/v810.h"
#include "cpu/v60/v60.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/es5506.h"
#include "includes/seta.h"
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 7955303c545..919a2a4e74a 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -69,7 +69,7 @@ TO DO :
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/okim6295.h"
UINT16 *stlforce_bg_videoram, *stlforce_mlow_videoram, *stlforce_mhigh_videoram, *stlforce_tx_videoram;
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 285b8097f52..04cd58e640c 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -154,7 +154,7 @@ ToDo / Notes:
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/sh2/sh2.h"
#include "machine/stvcd.h"
#include "machine/scudsp.h"
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 970e09353c4..cbf71892efe 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -37,7 +37,7 @@
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
#include "audio/taitosnd.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/es5506.h"
#include "includes/taito_f3.h"
#include "audio/taito_en.h"
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index fa4e4fdc2d3..04c2596b31c 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -171,7 +171,7 @@ Notes:
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/mb87078.h"
#include "machine/taitoio.h"
#include "audio/taitosnd.h"
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 4b2b4d4f223..bd3eebcb073 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -37,7 +37,7 @@
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/taito_f3.h"
#include "sound/es5506.h"
#include "audio/taito_en.h"
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index d05c739562c..c339167d1b5 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -879,7 +879,7 @@ J1100256A VIDEO PCB
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "video/taitoic.h"
#include "audio/taitosnd.h"
#include "sound/2610intf.h"
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index b118dea2195..3609c6120e0 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -355,7 +355,7 @@ Notes:
#include "includes/taito_f3.h"
#include "cpu/mc68hc11/mc68hc11.h"
#include "sound/es5506.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "audio/taito_en.h"
extern UINT32 *f3_shared_ram;
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index e3c4a2ab834..d054e80d20c 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -183,7 +183,7 @@ ae500w07.ad1 - M6295 Samples (23c4001)
#include "driver.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/tecmosys.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index e52ab3689e2..0161a3c75a1 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -105,7 +105,7 @@ To Do:
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "sound/okim6295.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/microtch.h"
#include "machine/68681.h"
diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c
index 42102c7cbad..de89a097e01 100644
--- a/src/mame/drivers/tmmjprd.c
+++ b/src/mame/drivers/tmmjprd.c
@@ -32,7 +32,7 @@
#include "driver.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "rendlay.h"
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 38ecdf6e1a9..ee7000da375 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -67,7 +67,7 @@ Updates:
#include "driver.h"
#include "deprecat.h"
#include "video/konicdev.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 863b722f0a0..6f9dbd534af 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -255,7 +255,7 @@ To Do / Unknowns:
#include "cpu/nec/nec.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/nmk112.h"
#include "sound/2151intf.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index c3a3782eb43..0c8d744e194 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -12,7 +12,7 @@ TODO:
#include "cpu/m68000/m68000.h"
#include "cpu/powerpc/ppc.h"
#include "sound/k054539.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "machine/konppc.h"
#include "sound/k056800.h"
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index 5cd11582d55..938391eeab9 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -190,7 +190,7 @@ Board contains only 29 ROMs and not much else.
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
#include "audio/taitosnd.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/es5506.h"
#include "includes/taito_f3.h"
#include "audio/taito_en.h"
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 8de8a6d68fa..1b1d0e9d543 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -24,7 +24,7 @@ Year + Game PCB Notes
#include "driver.h"
#include "cpu/m68000/m68000.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/unico.h"
#include "sound/2151intf.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 91437f4dd48..fb95ca2fb48 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -29,7 +29,7 @@
#include "driver.h"
#include "cpu/mcs51/mcs51.h"
#include "cpu/e132xs/e132xs.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2151intf.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index ea0b885a7f8..51476b80c26 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -90,7 +90,7 @@ Notes:
#include "cpu/z80/z80.h"
#include "video/konicdev.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/2151intf.h"
#include "sound/k053260.h"
#include "includes/konamipt.h"
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 99e468cee52..9c1d31a33bd 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -66,7 +66,7 @@ Unresolved Issues:
#include "deprecat.h"
#include "video/konicdev.h"
#include "cpu/z80/z80.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/k054539.h"
#include "sound/2151intf.h"
#include "sound/flt_vol.h"
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 8ed92537704..5d57e41e034 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -17,7 +17,7 @@ likewise be a 2 screen game
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "video/konicdev.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/z80/z80.h"
#include "sound/2151intf.h"
#include "sound/k054539.h"
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index dde2af5075f..6fb06b2bf3d 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -32,7 +32,7 @@ EEPROM chip: 93C46
#include "driver.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/m68000/m68000.h"
#include "sound/saa1099.h"
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 35d3b4754f8..0b70453c75a 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -171,7 +171,7 @@ Check gticlub.c for details on the bottom board.
#include "machine/konppc.h"
#include "machine/adc083x.h"
#include "machine/k056230.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "video/konicdev.h"
#include "video/gticlub.h"
#include "sound/k056800.h"
diff --git a/src/mame/machine/decoprot.c b/src/mame/machine/decoprot.c
index 3213314ae56..8f9ccb1f913 100644
--- a/src/mame/machine/decoprot.c
+++ b/src/mame/machine/decoprot.c
@@ -71,7 +71,7 @@
***************************************************************************/
#include "driver.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/decoprot.h"
#define DECO_PORT(p) (prot_ram[p/2])
diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c
index a6d438c2a4e..f4b33e223d2 100644
--- a/src/mame/machine/gaelco2.c
+++ b/src/mame/machine/gaelco2.c
@@ -9,7 +9,7 @@
#include "driver.h"
#include "deprecat.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "includes/gaelco2.h"
/***************************************************************************
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 01112da1a6d..3b8c35dd876 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -16,7 +16,7 @@ Currently none of the MCUs' internal roms are dumped so simulation is used
#include "includes/kaneko16.h"
#include "kanekotb.h" // TOYBOX MCU trojaning results
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#define CALC3_VERBOSE_OUTPUT 0
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index 8731f883b40..52bfc86d17e 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -8,7 +8,7 @@
#include "driver.h"
#include "cpu/i86/i86.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "cpu/z80/z80.h"
#include "includes/leland.h"
#include "sound/ay8910.h"
diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c
index c62759a823a..16f469a15fb 100644
--- a/src/mame/machine/simpsons.c
+++ b/src/mame/machine/simpsons.c
@@ -1,7 +1,7 @@
#include "driver.h"
#include "video/konicdev.h"
#include "cpu/konami/konami.h"
-#include "machine/eepromdev.h"
+#include "machine/eeprom.h"
#include "sound/k053260.h"
#include "includes/simpsons.h"