diff --git a/sys/conf/files b/sys/conf/files
index 1879ba09ae34..57437b1da113 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -98,11 +98,6 @@ dev/ccd/ccd.c		optional ccd
 dev/dpt/dpt_scsi.c	optional dpt
 dev/ed/if_ed.c		optional ed
 dev/ed/if_ed_pci.c	optional ed pci
-dev/ep/if_ep.c		optional ep
-dev/ep/if_ep_isa.c	optional ep isa
-dev/ep/if_ep_eisa.c	optional ep eisa
-dev/ep/if_ep_mca.c	optional ep mca
-dev/ep/if_ep_pccard.c	optional ep pccard
 dev/en/midway.c		optional en
 dev/hea/eni.c		optional hea
 dev/hea/eni_buffer.c	optional hea
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index c62bed3a0cf6..b0a3c2d64ec1 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -109,6 +109,7 @@ gnu/i386/isa/dgb.c		optional	dgb
 gnu/i386/isa/dgm.c		optional	dgm
 gnu/i386/isa/sound/awe_wave.c	optional	awe
 i386/apm/apm.c			optional	apm
+i386/eisa/3c5x9.c		optional	ep
 i386/eisa/adv_eisa.c		optional	adv
 i386/eisa/ahb.c			optional	ahb
 i386/eisa/ahc_eisa.c		optional	eisa ahc    \
@@ -197,9 +198,9 @@ i386/isa/if_ar.c		optional	ar
 i386/isa/if_cs.c		optional	cs
 i386/isa/if_cx.c		optional	cx
 i386/isa/if_el.c		optional	el
+i386/isa/if_ep.c		optional	ep
 i386/isa/if_ex.c		optional	ex
 i386/isa/if_fe.c		optional	fe
-i386/isa/if_feo.c		optional	feo
 i386/isa/if_ie.c		optional	ie
 i386/isa/if_le.c		optional	le
 i386/isa/if_lnc.c		optional	lnc
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index c62bed3a0cf6..b0a3c2d64ec1 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -109,6 +109,7 @@ gnu/i386/isa/dgb.c		optional	dgb
 gnu/i386/isa/dgm.c		optional	dgm
 gnu/i386/isa/sound/awe_wave.c	optional	awe
 i386/apm/apm.c			optional	apm
+i386/eisa/3c5x9.c		optional	ep
 i386/eisa/adv_eisa.c		optional	adv
 i386/eisa/ahb.c			optional	ahb
 i386/eisa/ahc_eisa.c		optional	eisa ahc    \
@@ -197,9 +198,9 @@ i386/isa/if_ar.c		optional	ar
 i386/isa/if_cs.c		optional	cs
 i386/isa/if_cx.c		optional	cx
 i386/isa/if_el.c		optional	el
+i386/isa/if_ep.c		optional	ep
 i386/isa/if_ex.c		optional	ex
 i386/isa/if_fe.c		optional	fe
-i386/isa/if_feo.c		optional	feo
 i386/isa/if_ie.c		optional	ie
 i386/isa/if_le.c		optional	le
 i386/isa/if_lnc.c		optional	lnc