diff --git a/sys/arch/evbarm/conf/files.evbarm b/sys/arch/evbarm/conf/files.evbarm
index 573917ce67e6..69c7d447f072 100644
--- a/sys/arch/evbarm/conf/files.evbarm
+++ b/sys/arch/evbarm/conf/files.evbarm
@@ -1,4 +1,4 @@
-#	$NetBSD: files.evbarm,v 1.3 2001/11/04 02:20:22 thorpej Exp $
+#	$NetBSD: files.evbarm,v 1.4 2001/11/04 02:38:28 thorpej Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -9,13 +9,6 @@ maxusers	2 8 64
 # Maintain Interrupt statistics
 defopt	IRQSTATS
 
-define todservice {}
-
-#
-# ISA and mixed ISA+EISA or ISA+PCI drivers
-#
-include "dev/isa/files.isa"
-
 # Include WSCONS stuff
 include "dev/wscons/files.wscons"
 include "dev/rasops/files.rasops"
@@ -27,17 +20,6 @@ include "dev/wsfont/files.wsfont"
 include "dev/ata/files.ata"
 major	{wd = 16}
 
-# ISA DMA glue
-file	arch/arm32/isa/isadma_machdep.c		isadma
-
-# XXX ISA joystick driver
-device	joy
-file	arch/arm32/isa/joy.c			joy needs-flag
-attach	joy at isa with joy_isa
-file	arch/arm32/isa/joy_isa.c		joy_isa
-attach	joy at isapnp with joy_isapnp
-file	arch/arm32/isa/joy_isapnp.c		joy_isapnp
-
 # Memory disk driver
 file	arch/arm32/dev/md_hooks.c		md & memory_disk_hooks
 major   {md = 18}
@@ -45,10 +27,6 @@ major   {md = 18}
 # RAIDframe
 major	{raid = 71}
 
-device	todclock
-attach	todclock at todservice
-file	arch/arm32/dev/todclock.c		todclock	needs-count
-
 #
 # Machine-independent SCSI drivers
 #
@@ -70,22 +48,11 @@ file	arch/arm32/fpe-arm/armfpe_glue.S	armfpe
 file	arch/arm32/fpe-arm/armfpe_init.c	armfpe
 file	arch/arm32/fpe-arm/armfpe.s		armfpe
 
-# ISA support.
-file	arch/arm32/isa/isa_io.c			isa
-file	arch/arm32/isa/isa_io_asm.S		isa
-
-# ISA Plug 'n Play autoconfiguration glue.
-file	arch/arm32/isa/isapnp_machdep.c		isapnp
-
-device	sysbeep
-attach	sysbeep at pcppi with sysbeep_isa
-file	arch/arm32/isa/sysbeep_isa.c		sysbeep_isa
-
-device	dsrtc: todservice
-attach	dsrtc at isa
-file	arch/arm32/isa/dsrtc.c			dsrtc
-
+#
+# Include ISA config
+#
 
+include "dev/isa/files.isa"			# ISA devices
 
 #
 # Include PCI config
@@ -97,15 +64,9 @@ include "dev/pci/files.pci"			# PCI devices
 include "dev/usb/files.usb"			# USB device
 include "dev/cardbus/files.cardbus"		# CARDBus device
 
-device	pcib: isabus
-attach	pcib at pci
-file	arch/evbarm/pci/pcib.c			pcib
-
 # XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
 # XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.
 # XXX (when the conf/files and files.isa bogons are fixed, this can
 # XXX be fixed as well.)
 
 file	arch/evbarm/pci/pciide_machdep.c	pciide
-
-include "dev/pckbc/files.pckbc"