2 files changed, 6 insertions, 4 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 08ba668..f4b88ef 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -235,6 +235,8 @@ dev/an/if_an.c		optional an
 dev/an/if_an_isa.c	optional an isa
 dev/an/if_an_pccard.c	optional an card
 dev/an/if_an_pci.c	optional an pci
+dev/ar/if_ar.c		optional ar
+dev/ar/if_ar_pci.c	optional ar pci
 dev/asr/asr.c		optional asr pci
 dev/ata/ata-all.c	optional ata
 dev/ata/ata-disk.c	optional atadisk
@@ -483,6 +485,8 @@ dev/sound/pcm/mixer.c	optional pcm
 dev/sound/pcm/mixer_if.m	optional pcm
 dev/sound/pcm/sound.c	optional pcm
 #dev/sound/usb/upcm.c	optional pcm usb
+dev/sr/if_sr.c		optional sr
+dev/sr/if_sr_pci.c	optional sr pci
 dev/streams/streams.c	optional streams
 dev/stg/tmc18c30.c	optional stg
 dev/stg/tmc18c30_pccard.c	optional stg card
@@ -1092,7 +1096,6 @@ pci/agp_i810.c		optional agp
 pci/alpm.c		optional alpm
 pci/amd.c		optional amd
 pci/cy_pci.c		optional cy pci
-pci/if_ar_p.c		optional ar pci
 pci/if_dc.c		optional dc
 pci/if_de.c		optional de
 pci/if_en_pci.c		optional en pci
@@ -1103,7 +1106,6 @@ pci/if_rl.c		optional rl
 pci/if_sf.c		optional sf
 pci/if_sis.c		optional sis
 pci/if_sk.c		optional sk
-pci/if_sr_p.c		optional sr pci
 pci/if_ste.c		optional ste
 pci/if_ti.c		optional ti
 pci/if_tl.c		optional tl
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index cc1acb4..4b2d196 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -91,6 +91,7 @@ contrib/dev/oltr/trlldhm.c	optional	oltr
 contrib/dev/oltr/trlldmac.c	optional	oltr
 dev/advansys/adv_isa.c		optional	adv isa
 dev/aic/aic_isa.c		optional	aic isa
+#dev/ar/if_ar_isa.c		optional	ar isa
 dev/ed/if_ed_isa.c		optional	ed isa
 dev/eisa/eisaconf.c		optional	eisa
 dev/fb/fb.c			optional	fb
@@ -105,6 +106,7 @@ dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
 dev/kbd/kbd.c			optional	vt
+dev/sr/if_sr_isa.c		optional	sr isa
 dev/syscons/schistory.c		count		sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
@@ -216,12 +218,10 @@ i386/isa/elink.c		optional	ep
 i386/isa/elink.c		optional	ie
 i386/isa/gpib.c			optional	gp
 i386/isa/gsc.c			count		gsc
-i386/isa/if_ar.c		optional	ar
 i386/isa/if_cx.c		optional	cx
 i386/isa/if_el.c		count		el
 i386/isa/if_le.c		count		le
 i386/isa/if_rdp.c		count		rdp
-i386/isa/if_sr.c		count		sr
 i386/isa/if_wl.c		count		wl
 i386/isa/if_wlp.c		optional	wlp
 i386/isa/intr_machdep.c		standard