Cosmetics...

Mainly remove space between locators parens, replace spaces with tabs
where appropriate and consistently align dependencies.

42 files changed, 1033 insertions, 1027 deletions

diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index 81e9d7ff5ba..1102614687d 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.64 2004/11/04 11:03:44 miod Exp $
+#	$OpenBSD: files.alpha,v 1.65 2005/03/08 20:00:22 tdeval Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -15,93 +15,93 @@ file	arch/alpha/dev/shared_intr.c	alpha_shared_intr | dec_eb164 |
 					dec_1000 | dec_1000a | dec_eb64plus
 
 define	alpha_sgmap
-file	arch/alpha/dev/sgmap_common.c alpha_sgmap | dec_3000_500
+file	arch/alpha/dev/sgmap_common.c		alpha_sgmap | dec_3000_500
 
 #
 # Bus-independent devices
 #
 
-device	mainbus { }			# no locators (yet?)
+device	mainbus {}			# no locators (yet?)
 attach	mainbus at root
 
-device	cpu { }				# not really optional
+device	cpu {}				# not really optional
 attach	cpu at mainbus
-file	arch/alpha/alpha/cpu.c		cpu
+file	arch/alpha/alpha/cpu.c			cpu
 
-major { ccd = 7 }
-major { vnd = 9 }
+major	{ccd = 7}
+major	{vnd = 9}
 
 #
 # Media Independent Interface (mii)
 #
-include "../../../dev/mii/files.mii"
+include	"../../../dev/mii/files.mii"
 
 #
 # Machine-independent SCSI drivers
 #
 
-include "scsi/files.scsi"
-major { st = 2 }
-major { cd = 3 }
-major { sd = 8 }
-major { rd = 6 }
+include	"scsi/files.scsi"
+major	{st = 2}
+major	{cd = 3}
+major	{sd = 8}
+major	{rd = 6}
 
 # I2O
-include "dev/i2o/files.i2o"
+include	"dev/i2o/files.i2o"
 
 # Raster operations
-include "dev/rasops/files.rasops"
-include "dev/wsfont/files.wsfont"
+include	"dev/rasops/files.rasops"
+include	"dev/wsfont/files.wsfont"
 
 #
 # "workstation console" routines
 #
 
-include "dev/wscons/files.wscons"
+include	"dev/wscons/files.wscons"
 
 #
 # Bus-independent support for DEC devices
 #
-include "dev/dec/files.dec"
+include	"dev/dec/files.dec"
 
 #
 # TURBOchannel Devices
 #
 
-include "dev/tc/files.tc"
+include	"dev/tc/files.tc"
 
 # TC attachment is MD
 attach	tc at tcbus
 
 device	tcasic: tcbus
 attach	tcasic at mainbus
-file	arch/alpha/tc/tcasic.c		tcasic
-file	arch/alpha/tc/tc_bus_mem.c	tcasic
-file	arch/alpha/tc/tc_dma.c		tcasic
-file	arch/alpha/tc/tc_dma_3000_300.c	tcasic & dec_3000_300
-file	arch/alpha/tc/tc_dma_3000_500.c	tcasic & dec_3000_500
-file	arch/alpha/tc/tc_sgmap.c	tcasic & dec_3000_500
-file	arch/alpha/tc/tc_3000_500.c	tcasic & dec_3000_500
-file	arch/alpha/tc/tc_3000_300.c	tcasic & dec_3000_300
+file	arch/alpha/tc/tcasic.c			tcasic
+file	arch/alpha/tc/tc_bus_mem.c		tcasic
+file	arch/alpha/tc/tc_dma.c			tcasic
+file	arch/alpha/tc/tc_dma_3000_300.c		tcasic & dec_3000_300
+file	arch/alpha/tc/tc_dma_3000_500.c		tcasic & dec_3000_500
+file	arch/alpha/tc/tc_sgmap.c		tcasic & dec_3000_500
+file	arch/alpha/tc/tc_3000_500.c		tcasic & dec_3000_500
+file	arch/alpha/tc/tc_3000_300.c		tcasic & dec_3000_300
 
 # the TURBOchannel IOCTL ASIC
 # IOASIC device and attachment defined in sys/dev/tc/files.tc
-file	arch/alpha/tc/ioasic.c		ioasic
+file	arch/alpha/tc/ioasic.c			ioasic
 
 # PMAG-B CX
 device	cfb: wsemuldisplaydev, wsrasteremulops
 attach	cfb at tc
-file	arch/alpha/tc/cfb.c		cfb		needs-flag
+file	arch/alpha/tc/cfb.c			cfb		needs-flag
 
 # PMAGB-B HX or CXT
 device	sfb: wsemuldisplaydev, wsrasteremulops
 attach	sfb at tc
-file	arch/alpha/tc/sfb.c		sfb		needs-flag
+file	arch/alpha/tc/sfb.c			sfb		needs-flag
 
 # 8530 UARTs
 device	scc
 attach	scc at ioasic
-file	arch/alpha/tc/scc.c		scc		needs-count
+file	arch/alpha/tc/scc.c			scc		needs-count
 
 # TC and baseboard ioasic Lance ethernet are in files.tc
 
@@ -113,48 +113,48 @@ file	arch/alpha/tc/scc.c		scc		needs-count
 # Machine-independent ATAPI drivers
 #
 
-include "dev/atapiscsi/files.atapiscsi"
-include "dev/ata/files.ata"
+include	"dev/atapiscsi/files.atapiscsi"
+include	"dev/ata/files.ata"
 
 # XXX Dummy bus needed for some multi-homed devices specified in files.isa
 define	pcmcia {}
 
-include "dev/pci/files.pci"	# XXX some ISA devs are 'at pci' too.
-include "dev/isa/files.isa"
-major { wd = 0 }
+include	"dev/pci/files.pci"	# XXX some ISA devs are 'at pci' too.
+include	"dev/isa/files.isa"
+major	{wd = 0}
 
-include "dev/puc/files.puc"
+include	"dev/puc/files.puc"
 
 #
 # ISA Bus devices
 #
 
-file	arch/alpha/isa/isa_machdep.c	isa
+file	arch/alpha/isa/isa_machdep.c		isa
 
-define isadma_bounce
-file arch/alpha/isa/isadma_bounce.c	isadma_bounce & isa_dma
+define	isadma_bounce
+file	arch/alpha/isa/isadma_bounce.c		isadma_bounce & isa_dma
 
-device isabeep
-attach isabeep at pcppi
+device	isabeep
+attach	isabeep at pcppi
 
-include "dev/pckbc/files.pckbc"
+include	"dev/pckbc/files.pckbc"
 
 # Floppy disk controller
 #device	fdc {[drive = -1]}: isa_dma
 device	fdc {[drive = -1]}
 attach	fdc at isa
-file	dev/isa/fdc.c	fdc needs-flag
+file	dev/isa/fdc.c				fdc needs-flag
 
 device	fd: disk, isa_dma
 attach	fd at fdc
-file	dev/isa/fd.c	fd needs-flag
+file	dev/isa/fd.c				fd needs-flag
 major	{fd = 4}
 
 #
 # EISA Bus support
 #
 
-include "dev/eisa/files.eisa"
+include	"dev/eisa/files.eisa"
 
 
 #
@@ -163,35 +163,35 @@ include "dev/eisa/files.eisa"
 
 # include "dev/pci/files.pci" XXX SEE ABOVE
 
-file    arch/alpha/pci/pciide_machdep.c  pci
+file	arch/alpha/pci/pciide_machdep.c		pci
 
 define	alpha_pci_sgmap_pte64
 file	arch/alpha/pci/pci_sgmap_pte64.c	alpha_pci_sgmap_pte64
 
 device	apecs: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64
 attach	apecs at mainbus
-file	arch/alpha/pci/apecs.c		apecs
-file	arch/alpha/pci/apecs_bus_io.c	apecs
-file	arch/alpha/pci/apecs_bus_mem.c	apecs
-file	arch/alpha/pci/apecs_pci.c	apecs
-file	arch/alpha/pci/apecs_dma.c	apecs
+file	arch/alpha/pci/apecs.c			apecs
+file	arch/alpha/pci/apecs_bus_io.c		apecs
+file	arch/alpha/pci/apecs_bus_mem.c		apecs
+file	arch/alpha/pci/apecs_pci.c		apecs
+file	arch/alpha/pci/apecs_dma.c		apecs
 
 device	lca: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64
 attach	lca at mainbus
-file	arch/alpha/pci/lca.c		lca
-file	arch/alpha/pci/lca_bus_io.c	lca
-file	arch/alpha/pci/lca_bus_mem.c	lca
-file	arch/alpha/pci/lca_pci.c	lca
-file	arch/alpha/pci/lca_dma.c	lca
+file	arch/alpha/pci/lca.c			lca
+file	arch/alpha/pci/lca_bus_io.c		lca
+file	arch/alpha/pci/lca_bus_mem.c		lca
+file	arch/alpha/pci/lca_pci.c		lca
+file	arch/alpha/pci/lca_dma.c		lca
 
 device	cia: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64
 attach	cia at mainbus
-file	arch/alpha/pci/cia.c		cia
-file	arch/alpha/pci/cia_dma.c	cia
-file	arch/alpha/pci/cia_pci.c	cia
-file	arch/alpha/pci/cia_bus_io.c	cia
-file	arch/alpha/pci/cia_bus_mem.c	cia
-file	arch/alpha/pci/cia_bwx_bus_io.c	cia
+file	arch/alpha/pci/cia.c			cia
+file	arch/alpha/pci/cia_dma.c		cia
+file	arch/alpha/pci/cia_pci.c		cia
+file	arch/alpha/pci/cia_bus_io.c		cia
+file	arch/alpha/pci/cia_bus_mem.c		cia
+file	arch/alpha/pci/cia_bwx_bus_io.c		cia
 file	arch/alpha/pci/cia_bwx_bus_mem.c	cia
 
 device	irongate: pcibus, isadma_bounce
@@ -202,16 +202,16 @@ file	arch/alpha/pci/irongate_bus_mem.c	irongate
 file	arch/alpha/pci/irongate_dma.c		irongate
 file	arch/alpha/pci/irongate_pci.c		irongate
 
-device  tsc { }
-attach  tsc at mainbus
-file    arch/alpha/pci/tsc.c            dec_6600
+device	tsc {}
+attach	tsc at mainbus
+file	arch/alpha/pci/tsc.c			dec_6600
 
-device  tsp: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64
-attach  tsp at tsc
-file    arch/alpha/pci/tsp_dma.c        tsp
-file    arch/alpha/pci/tsp_pci.c        tsp
-file    arch/alpha/pci/tsp_bus_io.c     tsp
-file    arch/alpha/pci/tsp_bus_mem.c    tsp
+device	tsp: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64
+attach	tsp at tsc
+file	arch/alpha/pci/tsp_dma.c		tsp
+file	arch/alpha/pci/tsp_pci.c		tsp
+file	arch/alpha/pci/tsp_bus_io.c		tsp
+file	arch/alpha/pci/tsp_bus_mem.c		tsp
 
 file	arch/alpha/pci/pci_2100_a50.c		dec_2100_a50
 file	arch/alpha/pci/pci_axppci_33.c		dec_axppci_33
@@ -230,23 +230,23 @@ file	arch/alpha/pci/pci_up1000.c		api_up1000
 # PCI Bus devices
 #
 
-file	arch/alpha/pci/pci_machdep.c	pci
+file	arch/alpha/pci/pci_machdep.c		pci
 
 device	sio: isabus, alpha_shared_intr, cy82c693
 attach	sio at pci
 device	pceb: isabus, eisabus, cy82c693
 attach	pceb at pci
-file	arch/alpha/pci/sio.c		sio | pceb	needs-flag
-file	arch/alpha/pci/sio_pic.c	sio | pceb
+file	arch/alpha/pci/sio.c			sio | pceb	needs-flag
+file	arch/alpha/pci/sio_pic.c		sio | pceb
 
 #
 # ISA PnP
 #
 
-include "../../../dev/isa/files.isapnp"
-file	arch/alpha/isa/isapnp_machdep.c	isapnp
+include	"../../../dev/isa/files.isapnp"
+file	arch/alpha/isa/isapnp_machdep.c		isapnp
 
-attach  com at isapnp with com_isapnp
+attach	com at isapnp with com_isapnp
 
 #
 # Devices that can live on multiple busses
@@ -255,9 +255,9 @@ attach  com at isapnp with com_isapnp
 device	mcclock
 attach	mcclock at ioasic with mcclock_ioasic
 attach	mcclock at isa with mcclock_isa
-file	arch/alpha/alpha/mcclock.c	mcclock
-file	arch/alpha/tc/mcclock_ioasic.c	mcclock_ioasic
-file	arch/alpha/isa/mcclock_isa.c	mcclock_isa
+file	arch/alpha/alpha/mcclock.c		mcclock
+file	arch/alpha/tc/mcclock_ioasic.c		mcclock_ioasic
+file	arch/alpha/isa/mcclock_isa.c		mcclock_isa
 
 #
 # Standard files
@@ -308,18 +308,18 @@ file	arch/alpha/alpha/dec_eb64plus.c		dec_eb64plus	needs-flag
 file	arch/alpha/alpha/dec_kn20aa.c		dec_kn20aa	needs-flag
 file	arch/alpha/alpha/dec_550.c		dec_550		needs-flag
 file	arch/alpha/alpha/dec_1000a.c		dec_1000 | dec_1000a	needs-flag
-file    arch/alpha/alpha/dec_6600.c             dec_6600	needs-flag
+file	arch/alpha/alpha/dec_6600.c		dec_6600	needs-flag
 file	arch/alpha/alpha/api_up1000.c		api_up1000	needs-flag
 
 # OSF/1 Binary Compatibility (COMPAT_OSF1)
-include "compat/osf1/files.osf1"
+include	"compat/osf1/files.osf1"
 file	arch/alpha/alpha/osf1_locore.s		compat_osf1
 
 # NetBSD binary compatibility (COMPAT_NETBSD)
-include "../../../compat/netbsd/files.netbsd"
+include	"../../../compat/netbsd/files.netbsd"
 file	arch/alpha/alpha/netbsd_machdep.c	compat_netbsd
 
 #
 # Machine-independent USB drivers
 #
-include "dev/usb/files.usb"
+include	"dev/usb/files.usb"
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 26d268c614d..9036b1b8597 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,11 +1,11 @@
-#	$OpenBSD: files.amd64,v 1.8 2005/03/05 23:58:43 tdeval Exp $
+#	$OpenBSD: files.amd64,v 1.9 2005/03/08 20:00:23 tdeval Exp $
 
 maxpartitions 16
 maxusers 2 16 128
 
 file	arch/amd64/amd64/autoconf.c
 file	arch/amd64/amd64/conf.c
-file	arch/amd64/amd64/disksubr.c	disk
+file	arch/amd64/amd64/disksubr.c		disk
 file	arch/amd64/amd64/gdt.c
 file	arch/amd64/amd64/machdep.c
 file	arch/amd64/amd64/identcpu.c
@@ -56,17 +56,17 @@ file	dev/clock_subr.c
 
 include	"dev/mii/files.mii"
 
-include "scsi/files.scsi"
+include	"scsi/files.scsi"
 
-include "dev/i2o/files.i2o"
+include	"dev/i2o/files.i2o"
 
-include "dev/atapiscsi/files.atapiscsi"
-include "dev/ata/files.ata"
+include	"dev/atapiscsi/files.atapiscsi"
+include	"dev/ata/files.ata"
 
-define mainbus {[apid = -1]}
+define	mainbus {[apid = -1]}
 device	mainbus: isabus, pcibus, mainbus
 attach	mainbus at root
-file	arch/amd64/amd64/mainbus.c	mainbus
+file	arch/amd64/amd64/mainbus.c		mainbus
 
 define	cpu {[apid = -1]}
 device	cpu
@@ -75,52 +75,52 @@ file	arch/amd64/amd64/cpu.c	cpu
 
 
 define	lapic
-file	arch/amd64/amd64/lapic.c	lapic needs-flag
+file	arch/amd64/amd64/lapic.c		lapic needs-flag
 
 device	ioapic: lapic
 attach	ioapic at mainbus
-file	arch/amd64/amd64/ioapic.c	ioapic needs-flag
+file	arch/amd64/amd64/ioapic.c		ioapic needs-flag
 
 #
 # PCI drivers
 #
 
-include "dev/pci/files.pci"
-file	arch/amd64/pci/pci_machdep.c	pci
-file	arch/amd64/pci/pciide_machdep.c	pciide
+include	"dev/pci/files.pci"
+file	arch/amd64/pci/pci_machdep.c		pci
+file	arch/amd64/pci/pciide_machdep.c		pciide
 
-include "dev/puc/files.puc"
+include	"dev/puc/files.puc"
 
 # PCI Host bridge chipsets
 device	pchb: pcibus
 attach	pchb at pci
-file	arch/amd64/pci/pchb.c		pchb
+file	arch/amd64/pci/pchb.c			pchb
 
 # PCI-ISA bridges
 device	pcib: isabus
 attach	pcib at pci
-file	arch/amd64/pci/pcib.c		pcib
+file	arch/amd64/pci/pcib.c			pcib
 
 device	aapic
 attach	aapic at pci
-file	arch/amd64/pci/aapic.c		aapic
+file	arch/amd64/pci/aapic.c			aapic
 
 #
 # ISA drivers
 #
 
-include "dev/isa/files.isa"
-include "dev/isa/files.isapnp"
-file	arch/amd64/isa/isa_machdep.c	isa
+include	"dev/isa/files.isa"
+include	"dev/isa/files.isapnp"
+file	arch/amd64/isa/isa_machdep.c		isa
 
 # attribute used to represent the "keyboard controller"
 # XXX should be a real device
-define	pckbcport { [irq = -1], [port = -1] }
+define	pckbcport {[irq = -1], [port = -1]}
 
-include "dev/wscons/files.wscons"
-include "dev/pckbc/files.pckbc"
+include	"dev/wscons/files.wscons"
+include	"dev/pckbc/files.pckbc"
 
-file    arch/amd64/amd64/wscons_machdep.c wsdisplay
+file	arch/amd64/amd64/wscons_machdep.c	wsdisplay
 
 device	sysbeep
 attach	sysbeep at pcppi
@@ -128,16 +128,16 @@ attach	sysbeep at pcppi
 # Floppy disk controller
 device	fdc {[drive = -1]}
 attach	fdc at isa
-file	dev/isa/fdc.c			fdc needs-flag
+file	dev/isa/fdc.c				fdc needs-flag
 
 device	fd: disk, isa_dma
 attach	fd at fdc
-file	dev/isa/fd.c			fd needs-flag
+file	dev/isa/fd.c				fd needs-flag
 
 #
 # USB
 #
-include "dev/usb/files.usb"
+include	"dev/usb/files.usb"
 
 #
 # device major numbers
diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index 48a5f1a952e..61c781e923e 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.arm,v 1.4 2005/01/13 16:15:11 drahn Exp $
+#	$OpenBSD: files.arm,v 1.5 2005/03/08 20:00:23 tdeval Exp $
 #	$NetBSD: files.arm,v 1.76 2003/11/05 12:53:15 scw Exp $
 
 # CPU types.  Make sure to update <arm/cpuconf.h> if you change this list.
@@ -47,13 +47,13 @@ file	arch/arm/arm/fiq.c
 file	arch/arm/arm/fiq_subr.S
 
 # mainbus files
-device	mainbus { [base = -1], [dack = -1], [irq = -1] }
+device	mainbus {[base = -1], [dack = -1], [irq = -1]}
 attach	mainbus at root
 file	arch/arm/mainbus/mainbus.c		mainbus
 file	arch/arm/mainbus/mainbus_io.c		mainbus
 file	arch/arm/mainbus/mainbus_io_asm.S	mainbus
 
-device	cpu { }
+device	cpu {}
 attach	cpu at mainbus with cpu_mainbus
 file	arch/arm/mainbus/cpu_mainbus.c		cpu_mainbus
 
@@ -94,9 +94,9 @@ file	arch/arm/arm/cpufunc_asm_sa1.S		cpu_sa110 | cpu_sa1100 |
 							cpu_ixp12x0
 file	arch/arm/arm/cpufunc_asm_sa11x0.S	cpu_sa1100 | cpu_sa1110
 file	arch/arm/arm/cpufunc_asm_xscale.S	cpu_xscale_80200 |
-						    cpu_xscale_80321 |
-						    cpu_xscale_ixp425 |
-						    cpu_xscale_pxa2x0
+							cpu_xscale_80321 |
+							cpu_xscale_ixp425 |
+							cpu_xscale_pxa2x0
 file	arch/arm/arm/cpufunc_asm_ixp12x0.S	cpu_ixp12x0
 file	arch/arm/arm/process_machdep.c
 file	arch/arm/arm/procfs_machdep.c		procfs
diff --git a/sys/arch/arm/xscale/files.pxa2x0 b/sys/arch/arm/xscale/files.pxa2x0
index b9523ad7590..e066256c77b 100644
--- a/sys/arch/arm/xscale/files.pxa2x0
+++ b/sys/arch/arm/xscale/files.pxa2x0
@@ -1,15 +1,15 @@
-#	$OpenBSD: files.pxa2x0,v 1.9 2005/02/22 21:53:03 uwe Exp $
+#	$OpenBSD: files.pxa2x0,v 1.10 2005/03/08 20:00:23 tdeval Exp $
 #	$NetBSD: files.pxa2x0,v 1.6 2004/05/01 19:09:14 thorpej Exp $
 #
 # Configuration info for Intel PXA2[51]0 CPU support
 #
 
-file	arch/arm/arm/softintr.c  # Use the generic ARM soft interrupt code.
+file	arch/arm/arm/softintr.c	# Use the generic ARM soft interrupt code.
 
 # PXA2[51]0's integrated peripherals bus.
-define pxaip { [addr=-1], [size=0], [intr=-1], [index=-1]}
-device pxaip
-attach pxaip at mainbus
+define	pxaip {[addr=-1], [size=0], [intr=-1], [index=-1]}
+device	pxaip
+attach	pxaip at mainbus
 file	arch/arm/xscale/pxa2x0.c
 file	arch/arm/arm/irq_dispatch.S
 file	arch/arm/xscale/pxa2x0_space.c
@@ -22,13 +22,13 @@ file	arch/arm/xscale/pxa2x0_dma.c
 # INTC controller
 device	pxaintc
 attach	pxaintc at pxaip
-file arch/arm/xscale/pxa2x0_intr.c		pxaintc needs-flag
+file	arch/arm/xscale/pxa2x0_intr.c		pxaintc needs-flag
 #defflag  opt_pxa2x0_gpio.h		PXAGPIO_HAS_GPION_INTRS
 
 # GPIO controller
 device	pxagpio
 attach	pxagpio at pxaip
-file arch/arm/xscale/pxa2x0_gpio.c		pxagpio needs-flag
+file	arch/arm/xscale/pxa2x0_gpio.c		pxagpio needs-flag
 
 # clock device
 # PXA2x0's built-in timer is compatible to SA-1110.
@@ -37,10 +37,10 @@ attach	saost at pxaip
 file	arch/arm/sa11x0/sa11x0_ost.c		saost needs-flag
 
 # NS16550 compatible serial ports
-attach com at pxaip with pxauart
-file arch/arm/xscale/pxa2x0_com.c		pxauart
-file arch/arm/xscale/pxa2x0_a4x_space.c		pxauart | obio
-file arch/arm/xscale/pxa2x0_a4x_io.S		pxauart | obio
+attach	com at pxaip with pxauart
+file	arch/arm/xscale/pxa2x0_com.c		pxauart
+file	arch/arm/xscale/pxa2x0_a4x_space.c	pxauart | obio
+file	arch/arm/xscale/pxa2x0_a4x_io.S		pxauart | obio
 #defflag	opt_com.h	FFUARTCONSOLE STUARTCONSOLE BTUARTCONSOLE
 
 # PXA27x USB Device Controller
@@ -53,8 +53,8 @@ attach	ohci at pxaip with pxaohci
 file	arch/arm/xscale/pxa2x0_ohci.c		pxaohci
 
 # LCD controller
-device lcd: wsemuldisplaydev, rasops16, rasops8, rasops4
-file arch/arm/xscale/pxa2x0_lcd.c		lcd needs-flag
+device	lcd: wsemuldisplaydev, rasops16, rasops8, rasops4
+file	arch/arm/xscale/pxa2x0_lcd.c		lcd needs-flag
 
 # Power manager and APM emulation
 device	apm
@@ -64,11 +64,11 @@ file	arch/arm/xscale/pxa2x0_apm_asm.S	apm
 include	"dev/pcmcia/files.pcmcia"
 
 # PCMCIA controller
-device pxapcic: pcmciabus
-attach pxapcic at pxaip
-file arch/arm/xscale/pxa2x0_pcic.c		pxapcic
+device	pxapcic: pcmciabus
+attach	pxapcic at pxaip
+file	arch/arm/xscale/pxa2x0_pcic.c		pxapcic
 
 # XXX this is a hack to use dev/pcmcia without fdc.c
 device	fdc
 
-file   arch/arm/xscale/pxacom.c            com & pxauart needs-flag
+file	arch/arm/xscale/pxacom.c		com & pxauart needs-flag
diff --git a/sys/arch/cats/conf/files.cats b/sys/arch/cats/conf/files.cats
index 465790084f9..cc4910918f3 100644
--- a/sys/arch/cats/conf/files.cats
+++ b/sys/arch/cats/conf/files.cats
@@ -1,4 +1,4 @@
-# 	$OpenBSD: files.cats,v 1.3 2004/02/23 05:07:54 drahn Exp $
+# 	$OpenBSD: files.cats,v 1.4 2005/03/08 20:00:23 tdeval Exp $
 #	$NetBSD: files.cats,v 1.27 2003/10/21 08:15:40 skrll Exp $
 #
 # CATS-specific configuration info
@@ -22,14 +22,14 @@ include "arch/arm/conf/files.footbridge"
 # Machine-independent ATA drivers
 #
 include "dev/ata/files.ata"
-major {wd = 16}
+major	{wd = 16}
 
 #
 # time of day clock
 #
 device	todclock
 attach	todclock at todservice
-file	arch/arm/footbridge/todclock.c			todclock	needs-count
+file	arch/arm/footbridge/todclock.c			todclock needs-count
 
 # ISA DMA glue
 file	arch/arm/footbridge/isa/isadma_machdep.c	isadma
@@ -59,7 +59,7 @@ file	arch/cats/cats/cats_machdep.c
 
 # library functions
 
-file	arch/arm/arm/disksubr.c			disk
+file	arch/arm/arm/disksubr.c				disk
 
 # ISA Plug 'n Play autoconfiguration glue.
 file	arch/arm/footbridge/isa/isapnp_machdep.c	isapnp
@@ -92,9 +92,9 @@ include "dev/pci/files.pci"
 
 device	pcib: isabus
 attach	pcib at pci
-file	arch/cats/pci/pcib.c			pcib
+file	arch/cats/pci/pcib.c				pcib
 
-file	arch/cats/pci/pciide_machdep.c		pciide
+file	arch/cats/pci/pciide_machdep.c			pciide
 
 # Include USB stuff
 include "dev/usb/files.usb"
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index b4e214ee28f..2ab51c9af7d 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hp300,v 1.26 2005/01/24 21:36:37 miod Exp $
+#	$OpenBSD: files.hp300,v 1.27 2005/03/08 20:00:23 tdeval Exp $
 #	$NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $
 #
 # hp300-specific configuration info
@@ -12,16 +12,16 @@ maxusers 2 8 64
 # Mainbus
 #
 
-device	mainbus { }
+device	mainbus {}
 attach	mainbus at root
 
 #
 # Internal i/o space
 #
 
-device	intio { }
+device	intio {}
 attach	intio at mainbus
-file	arch/hp300/dev/intio.c		intio
+file	arch/hp300/dev/intio.c			intio
 
 #
 # DIO bus
@@ -29,15 +29,15 @@ file	arch/hp300/dev/intio.c		intio
 
 device	dio {[scode = -1]}
 attach	dio at mainbus
-file	arch/hp300/dev/dio.c		dio
+file	arch/hp300/dev/dio.c			dio
 
 #
 # SGC bus
 #
 
-device	sgc {[ slot = -1]}
+device	sgc {[slot = -1]}
 attach	sgc at mainbus
-file	arch/hp300/dev/sgc.c		sgc	needs-flag
+file	arch/hp300/dev/sgc.c			sgc	needs-flag
 
 #
 # Devices in Internal i/o space
@@ -46,17 +46,17 @@ file	arch/hp300/dev/sgc.c		sgc	needs-flag
 # Apollo Utilility Chip (a.k.a. "Frodo") found on 4xx workstations
 device	frodo {[offset = -1]}
 attach	frodo at intio
-file	arch/hp300/dev/frodo.c		frodo
+file	arch/hp300/dev/frodo.c			frodo
 
 # Apollo Keyboard and mouse
 device	dnkbd
 attach	dnkbd at frodo
-file	arch/hp300/dev/dnkbd.c		dnkbd	needs-flag
+file	arch/hp300/dev/dnkbd.c			dnkbd	needs-flag
 
 # Apollo APCI 8250-like UARTs
 device	apci
 attach	apci at frodo
-file	arch/hp300/dev/apci.c		apci	needs-flag
+file	arch/hp300/dev/apci.c			apci	needs-flag
 
 # "workstation console" routines
 include	"dev/rasops/files.rasops"
@@ -68,31 +68,31 @@ file	arch/hp300/hp300/wscons_machdep.c	wsdisplay
 # Frame buffer devices
 #
 define	diofb
-file	arch/hp300/dev/diofb.c		diofb
+file	arch/hp300/dev/diofb.c			diofb
 
 device	dvbox: wsemuldisplaydev, diofb, rasops8
 attach	dvbox at intio with dvbox_intio
 attach	dvbox at dio with dvbox_dio
-file	arch/hp300/dev/dvbox.c		dvbox	needs-flag
+file	arch/hp300/dev/dvbox.c			dvbox	needs-flag
 
 device	gbox: wsemuldisplaydev, diofb, rasops8
 attach	gbox at intio with gbox_intio
 attach	gbox at dio with gbox_dio
-file	arch/hp300/dev/gbox.c		gbox	needs-flag
+file	arch/hp300/dev/gbox.c			gbox	needs-flag
 
 device	hyper: wsemuldisplaydev, diofb, rasops1
 attach	hyper at dio
-file	arch/hp300/dev/hyper.c		hyper	needs-flag
+file	arch/hp300/dev/hyper.c			hyper	needs-flag
 
 device	rbox: wsemuldisplaydev, diofb, rasops8
 attach	rbox at intio with rbox_intio
 attach	rbox at dio with rbox_dio
-file	arch/hp300/dev/rbox.c		rbox	needs-flag
+file	arch/hp300/dev/rbox.c			rbox	needs-flag
 
 device	topcat: wsemuldisplaydev, diofb, rasops8
 attach	topcat at intio with topcat_intio
 attach	topcat at dio with topcat_dio
-file	arch/hp300/dev/topcat.c		topcat	needs-flag
+file	arch/hp300/dev/topcat.c			topcat	needs-flag
 
 #
 # Other devices on the DIO bus
@@ -101,50 +101,50 @@ file	arch/hp300/dev/topcat.c		topcat	needs-flag
 # DCA serial interface
 device	dca: tty
 attach	dca at dio
-file	arch/hp300/dev/dca.c		dca	needs-flag
+file	arch/hp300/dev/dca.c			dca	needs-flag
 
 # DCM serial interface
 device	dcm: tty
 attach	dcm at dio
-file	arch/hp300/dev/dcm.c		dcm	needs-flag
+file	arch/hp300/dev/dcm.c			dcm	needs-flag
 
 # LANCE ethernet
 attach	le at dio
-file	arch/hp300/dev/if_le.c		le
+file	arch/hp300/dev/if_le.c			le
 
 # HP-IB interfaces
-define	hpibdev { }
+define	hpibdev {}
 
 device	nhpib: hpibdev
 attach	nhpib at dio
-file	arch/hp300/dev/nhpib.c		nhpib
+file	arch/hp300/dev/nhpib.c			nhpib
 
 device	fhpib: hpibdev
 attach	fhpib at dio
-file	arch/hp300/dev/fhpib.c		fhpib
+file	arch/hp300/dev/fhpib.c			fhpib
 
 # HP-IB bus layer
 device	hpibbus {[slave = -1], [punit = -1]}
 attach	hpibbus at hpibdev
-file	arch/hp300/dev/hpib.c		hpibbus
+file	arch/hp300/dev/hpib.c			hpibbus
 
 # HP-IB devices
 device	ct: tape
 attach	ct at hpibbus
-file	arch/hp300/dev/ct.c		ct	needs-flag
+file	arch/hp300/dev/ct.c			ct	needs-flag
 
 device	mt: tape
 attach	mt at hpibbus
-file	arch/hp300/dev/mt.c		mt	needs-flag
+file	arch/hp300/dev/mt.c			mt	needs-flag
 
 device	hd: disk
 attach	hd at hpibbus
-file	arch/hp300/dev/hd.c		hd	needs-flag
+file	arch/hp300/dev/hd.c			hd	needs-flag
 major	{hd = 2}
 
 device	ppi
 attach	ppi at hpibbus
-file	arch/hp300/dev/ppi.c		ppi	needs-flag
+file	arch/hp300/dev/ppi.c			ppi	needs-flag
 
 # RAM disk
 major	{rd = 8}
@@ -154,8 +154,8 @@ include	"scsi/files.scsi"
 
 device	spc: scsi
 attach	spc at dio
-file	arch/hp300/dev/spc.c		spc	needs-flag
-file	arch/hp300/dev/mb89352.c	spc
+file	arch/hp300/dev/spc.c			spc	needs-flag
+file	arch/hp300/dev/mb89352.c		spc
 
 major	{sd = 4}
 major	{cd = 9}
@@ -165,7 +165,7 @@ major	{cd = 9}
 #
 
 attach	sti at sgc with sti_sgc
-file	arch/hp300/dev/sti_sgc.c	sti_sgc
+file	arch/hp300/dev/sti_sgc.c		sti_sgc
 
 #
 # HIL Human Interface Loop devices
@@ -173,7 +173,7 @@ file	arch/hp300/dev/sti_sgc.c	sti_sgc
 include	"dev/hil/files.hil"
 
 attach	hil at intio with hil_intio
-file	arch/hp300/dev/hil_intio.c	hil_intio
+file	arch/hp300/dev/hil_intio.c		hil_intio
 
 #
 # Non-device files
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index dda7b6737d1..926a9f9422a 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hppa,v 1.57 2004/10/29 20:23:35 miod Exp $
+#	$OpenBSD: files.hppa,v 1.58 2005/03/08 20:00:23 tdeval Exp $
 #
 # hppa-specific configuration info
 
@@ -22,9 +22,9 @@ include "dev/mii/files.mii"
 # Machine-independent SCSI drivers
 #
 include "scsi/files.scsi"
-major	{ sd = 4 }
-major	{ st = 5 }
-major	{ cd = 6 }
+major	{sd = 4}
+major	{st = 5}
+major	{cd = 6}
 
 # I2O
 include "dev/i2o/files.i2o"
@@ -75,7 +75,7 @@ include "dev/hil/files.hil"
 # Gonzo System Connect Bus
 #	(GSC, GSC-1X, GSC+, GSC-1.5X, GSC-2X)
 #
-define	gscbus	{ }
+define	gscbus	{}
 
 #
 # Mainbus
@@ -84,57 +84,57 @@ define	gscbus	{ }
 define	gedoens {[offset = -1], [irq = -1]}
 device	mainbus: gedoens
 attach	mainbus at root
-file	arch/hppa/hppa/mainbus.c	mainbus
+file	arch/hppa/hppa/mainbus.c		mainbus
 
 device	pdc
 attach	pdc at gedoens
-file	arch/hppa/dev/pdc.c		pdc
+file	arch/hppa/dev/pdc.c			pdc
 
 device	power
 attach	power at gedoens
-file	arch/hppa/dev/power.c		power needs-flag
+file	arch/hppa/dev/power.c			power needs-flag
 
 device	mem
 attach	mem at gedoens
-file	arch/hppa/dev/mem.c		mem
+file	arch/hppa/dev/mem.c			mem
 
 device	cpu
 attach	cpu at gedoens
-file	arch/hppa/dev/cpu.c		cpu
+file	arch/hppa/dev/cpu.c			cpu
 
 device	fpu
 attach	fpu at gedoens
-file	arch/hppa/dev/fpu.c		fpu
+file	arch/hppa/dev/fpu.c			fpu
 
 # Phantom PseudoBC GSC+ Port
 device	phantomas: gedoens
 attach	phantomas at gedoens
-file	arch/hppa/dev/phantomas.c	phantomas
+file	arch/hppa/dev/phantomas.c		phantomas
 
 # U2/Uturn, Runway to GSC Bus bridge & IOA.
 device	uturn: gedoens
 attach	uturn at gedoens
-file	arch/hppa/dev/uturn.c		uturn
+file	arch/hppa/dev/uturn.c			uturn
 
 # 1FT1-0002, 1FU2-0002
 # as goes w/ 7100LC, 7300LC, 7200 and some of 8000, 8200, 8500
 device	lasi: gscbus
 attach	lasi at gedoens
-file	arch/hppa/dev/lasi.c		lasi
+file	arch/hppa/dev/lasi.c			lasi
 
 # all the older systems
 device	asp: gscbus
 attach	asp at gedoens
-file	arch/hppa/dev/asp.c		asp
+file	arch/hppa/dev/asp.c			asp
 
 # 1FT4-0001, ASIC used on gecko cards
 device	wax: gscbus, isabus, eisabus
 attach	wax at gedoens
-file	arch/hppa/dev/wax.c		wax
+file	arch/hppa/dev/wax.c			wax
 
 device	mongoose: isabus, eisabus
 attach	mongoose at gedoens with mg_gedoens
-file	arch/hppa/dev/mongoose.c	mongoose
+file	arch/hppa/dev/mongoose.c		mongoose
 
 define	dinobus {[offset = -1], [irq = -1]}
 
@@ -142,22 +142,22 @@ define	dinobus {[offset = -1], [irq = -1]}
 # Cujo is a 64-bit data path Dino
 device	dino: pcibus, dinobus
 attach	dino at gedoens
-file	arch/hppa/dev/dino.c		dino
+file	arch/hppa/dev/dino.c			dino
 
 attach	com at dinobus with com_dino
-file	arch/hppa/dev/com_dino.c	com_dino
+file	arch/hppa/dev/com_dino.c		com_dino
 
 # EPIC, Excalibur PCI Interface Chip. Integrated IOA
 # SAGA is a 64-bit data path EPIC
 #device	epic: pcibus
 #attach	epic at gedoens
-#file	arch/hppa/dev/epic.c		epic
+#file	arch/hppa/dev/epic.c			epic
 
 attach	sti at gedoens with sti_gedoens
-file	arch/hppa/dev/sti_sgc.c		sti_gedoens
+file	arch/hppa/dev/sti_sgc.c			sti_gedoens
 
 attach	siop at gedoens with siop_sgc
-file	arch/hppa/dev/siop_sgc.c	siop_sgc
+file	arch/hppa/dev/siop_sgc.c		siop_sgc
 
 ###
 
@@ -171,74 +171,74 @@ major	{rd = 3}
 
 device	gsc {[offset = -1], [irq = -1]}
 attach	gsc at gscbus
-file	arch/hppa/gsc/gscbus.c		gsc
+file	arch/hppa/gsc/gscbus.c			gsc
 
 # com and lpt are both on WD 16C552
 attach	com at gsc with com_gsc
-file	arch/hppa/gsc/com_gsc.c		com_gsc
+file	arch/hppa/gsc/com_gsc.c			com_gsc
 
 attach	lpt at gsc with lpt_gsc
-file	arch/hppa/gsc/lpt_gsc.c		lpt_gsc
+file	arch/hppa/gsc/lpt_gsc.c			lpt_gsc
 
 attach	mongoose at gsc with mg_gsc
-file	arch/hppa/gsc/mongoose_gsc.c	mg_gsc
+file	arch/hppa/gsc/mongoose_gsc.c		mg_gsc
 
 #include "dev/fdc/files.fdc"
-#major	{ fd = 7 }
-#major	{ ft = 8 }
+#major	{fd = 7}
+#major	{ft = 8}
 #attach	fdc at gsc with fdc_gsc
-#file	arch/hppa/gsc/fdc_gsc.c		fdc_gsc
+#file	arch/hppa/gsc/fdc_gsc.c			fdc_gsc
 
 attach	ie at gsc with ie_gsc
-file	arch/hppa/gsc/if_ie_gsc.c	ie_gsc
+file	arch/hppa/gsc/if_ie_gsc.c		ie_gsc
 
 attach	osiop at gsc with osiop_gsc
-file	arch/hppa/gsc/osiop_gsc.c	osiop_gsc
+file	arch/hppa/gsc/osiop_gsc.c		osiop_gsc
 
 attach	oosiop at gsc with oosiop_gsc
-file	arch/hppa/gsc/oosiop_gsc.c	oosiop_gsc
+file	arch/hppa/gsc/oosiop_gsc.c		oosiop_gsc
 
 attach	hil at gsc with hil_gsc
-file	arch/hppa/gsc/hil_gsc.c		hil_gsc
+file	arch/hppa/gsc/hil_gsc.c			hil_gsc
 
 # PSB 2160-N based 8bit mono audio (705, 710, 745i/*, 747i/*)
 device	aone: audio, mulaw, auconv
 attach	aone at gsc
-file	arch/hppa/gsc/aone.c		aone
+file	arch/hppa/gsc/aone.c			aone
 
 # CS4215/AD1849 based 16bit mono/stereo audio iface (most of others not w/ aone)
 # a.k.a. Audio Type 2 (optional beeper)
 device	harmony: audio, mulaw, auconv
 attach	harmony at gsc
-file	arch/hppa/gsc/harmony.c		harmony
+file	arch/hppa/gsc/harmony.c			harmony
 
 # HPA4011A/B w/ TMS380C26PQL, TMS38054FNL
 #device	tms: tokenring
 #attach	tms at gsc
-#file	arch/hppa/gsc/if_tms.c		tms
+#file	arch/hppa/gsc/if_tms.c			tms
 
 # these we don't know yet
 # AMD Supernet2 FDDI ?
 #device	medusa: fddi
 #attach	medusa at gsc
-#file	arch/hppa/gsc/medusa.c		medusa
+#file	arch/hppa/gsc/medusa.c			medusa
 
 # XXX should not be here
 # ANSI/VITA 26-1998 Gbit packet switching network iface
 #device	myri: ether
 #attach	myri at pci
-#file	dev/pci/myri.c			myri
+#file	dev/pci/myri.c				myri
 
 # PS/2 input ports
-#device	gsckbc { [slot = -1] }
+#device	gsckbc {[slot = -1]}
 attach	gsckbc at gsc
-file	arch/hppa/gsc/gsckbc.c		gsckbc
+file	arch/hppa/gsc/gsckbc.c			gsckbc
 
 # PS/2 keyboard
 device	gsckbd: wskbddev
 attach	gsckbd at gsckbc
-file	arch/hppa/gsc/gsckbd.c		gsckbd	needs-flag
-file	arch/hppa/gsc/gsckbdmap.c	gsckbd
+file	arch/hppa/gsc/gsckbd.c			gsckbd	needs-flag
+file	arch/hppa/gsc/gsckbdmap.c		gsckbd
 
 # PS/2 mouse
 include	"dev/pckbc/files.pckbc"
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 7f37ee63a4d..d6dbbe6b62a 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.131 2005/03/05 23:58:43 tdeval Exp $
+#	$OpenBSD: files.i386,v 1.132 2005/03/08 20:00:23 tdeval Exp $
 #
 # new style config file for i386 architecture
 #
@@ -172,7 +172,7 @@ include "../../../gnu/arch/i386/fpemul/files.fpemul"
 
 # attribute used to represent the "keyboard controller"
 # XXX should be a real device
-define pckbcport { [irq = -1], [port = -1] }
+define pckbcport {[irq = -1], [port = -1]}
 
 # 8250/16[45]50-based "com" ports, optimized for the i386 interrupt system
 device	pccom: tty
diff --git a/sys/arch/luna88k/conf/files.luna88k b/sys/arch/luna88k/conf/files.luna88k
index 3798817215e..b69e2d97db2 100644
--- a/sys/arch/luna88k/conf/files.luna88k
+++ b/sys/arch/luna88k/conf/files.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.luna88k,v 1.8 2004/10/08 13:04:36 grange Exp $
+#	$OpenBSD: files.luna88k,v 1.9 2005/03/08 20:00:23 tdeval Exp $
 #	
 maxpartitions 16
 
@@ -13,7 +13,7 @@ file	arch/luna88k/dev/timekeeper.c			clock
 attach le at mainbus
 file	arch/luna88k/dev/if_le.c			le
 
-device sio { [channel = -1] }
+device sio {[channel = -1]}
 attach sio at mainbus
 file	arch/luna88k/dev/sio.c				sio
 
@@ -46,11 +46,11 @@ attach cpu at mainbus
 
 include "../../../scsi/files.scsi"
 
-major { sd = 4 }
-major { st = 5 }
-major { cd = 6 }
-major { rd = 7 }
-major { vnd = 8 }
+major {sd = 4}
+major {st = 5}
+major {cd = 6}
+major {rd = 7}
+major {vnd = 8}
 
 device spc: scsi
 attach spc at mainbus
@@ -61,7 +61,7 @@ file arch/luna88k/dev/mb89352.c				spc
 #device pcm: audio, auconv, mulaw
 #attach pcm at mainbus
 #file arch/luna88k/dev/nec86.c				pcm needs-flag
-#file arch/luna88k/dev/nec86hw.c				pcm needs-flag
+#file arch/luna88k/dev/nec86hw.c			pcm needs-flag
 #file arch/luna88k/dev/nec86_luna88k.c			pcm needs-flag
 
 # list of standard files
diff --git a/sys/arch/m68k/conf/files.m68k b/sys/arch/m68k/conf/files.m68k
index 725a96c919d..6832a935877 100644
--- a/sys/arch/m68k/conf/files.m68k
+++ b/sys/arch/m68k/conf/files.m68k
@@ -1,5 +1,5 @@
-#       $OpenBSD: files.m68k,v 1.10 2001/11/21 00:29:58 miod Exp $
-#       $NetBSD: files.m68k,v 1.18 1997/06/06 23:15:28 veego Exp $
+#	$OpenBSD: files.m68k,v 1.11 2005/03/08 20:00:23 tdeval Exp $
+#	$NetBSD: files.m68k,v 1.18 1997/06/06 23:15:28 veego Exp $
 #
 file	arch/m68k/m68k/db_disasm.c		ddb
 file	arch/m68k/m68k/db_interface.c		ddb
@@ -21,10 +21,10 @@ file	arch/m68k/m68k/regdump.c
 #
 # Older m68k4k executables binary compatibility
 #
-include "compat/m68k4k/files.m68k4k"
+include	"compat/m68k4k/files.m68k4k"
 
 #
 # SunOS binary compatibility
 #
-include "compat/sunos/files.sunos"
+include	"compat/sunos/files.sunos"
 file	arch/m68k/m68k/sunos_machdep.c		compat_sunos
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k
index 015308f2bf0..e9b8684f20a 100644
--- a/sys/arch/mac68k/conf/files.mac68k
+++ b/sys/arch/mac68k/conf/files.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mac68k,v 1.32 2004/11/25 18:32:06 miod Exp $
+#	$OpenBSD: files.mac68k,v 1.33 2005/03/08 20:00:23 tdeval Exp $
 #	$NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $
 
 # mac68k-specific configuration info
@@ -8,16 +8,16 @@ maxpartitions 16
 
 maxusers 2 8 64
 
-device mainbus { }			# no locators (yet?)
+device mainbus {}			# no locators (yet?)
 attach mainbus at root
 
-define obio_norm { [addr = -1], ["no drq" = -1], ["no hsk" = -1] }
-define obio_scsi5380 { [addr = -1], [drq = -1], [hsk = -1] }
+define obio_norm {[addr = -1], ["no drq" = -1], ["no hsk" = -1]}
+define obio_scsi5380 {[addr = -1], [drq = -1], [hsk = -1]}
 device	obio: obio_norm, obio_scsi5380
 attach	obio at mainbus
 file	arch/mac68k/dev/obio.c		obio
 
-device	nubus { }
+device	nubus {}
 attach	nubus at mainbus
 file	arch/mac68k/dev/nubus.c		nubus
 
@@ -33,7 +33,7 @@ device	asc
 attach	asc at obio_norm
 file	arch/mac68k/dev/asc.c		asc needs-flag
 
-define grfbus { }
+define grfbus {}
 file	arch/mac68k/dev/grf_subr.c	grfbus
 
 device	intvid: grfbus
@@ -44,7 +44,7 @@ device	macvid: grfbus
 attach	macvid at nubus
 file	arch/mac68k/dev/grf_mv.c	macvid
 
-device	grf { }
+device	grf {}
 attach	grf at grfbus
 file	arch/mac68k/dev/grf.c		grf needs-flag
 
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index ef209d39e91..debb94b3ece 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.macppc,v 1.23 2005/03/05 23:58:43 tdeval Exp $
+#	$OpenBSD: files.macppc,v 1.24 2005/03/08 20:00:23 tdeval Exp $
 
 #
 # macppc-specific configuration info
@@ -46,7 +46,7 @@ file	arch/macppc/macppc/cpu.c
 
 include "../../../dev/ofw/files.ofw"
 file	arch/macppc/macppc/opendev.c
-major	{ ofdisk = 4 }
+major	{ofdisk = 4}
 
 
 device	memc {}
@@ -175,19 +175,19 @@ attach	awacs at macobio
 file	arch/macppc/dev/awacs.c				awacs
 
 # Mediabay
-device mediabay {}
-attach mediabay at macobio
+device	mediabay {}
+attach	mediabay at macobio
 file	arch/macppc/dev/mediabay.c			mediabay
 
 # Keywest I2C
-device ki2c {}
-attach ki2c at macobio
+device	ki2c {}
+attach	ki2c at macobio
 file	arch/macppc/dev/ki2c.c				ki2c
 
 # snapper audio
 device	snapper: audio, auconv, mulaw
 attach	snapper at macobio
-file	 arch/macppc/dev/snapper.c			snapper
+file	arch/macppc/dev/snapper.c			snapper
 
 #device	nvram
 #attach	nvram at macobio
@@ -237,4 +237,4 @@ device	hme: ether, ifnet, mii, ifmedia
 file	dev/ic/hme.c
 
 attach	hme at pci with hme_pci
-file	dev/pci/if_hme_pci.c		hme_pci
+file	dev/pci/if_hme_pci.c				hme_pci
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index 42527c73c49..b39a66c22fc 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme68k,v 1.25 2004/10/08 13:04:36 grange Exp $
+#	$OpenBSD: files.mvme68k,v 1.26 2005/03/08 20:00:23 tdeval Exp $
 
 # config file for mvme68k
 
@@ -7,124 +7,124 @@ maxpartitions 16
 
 maxusers 2 8 64
 
-device mainbus { [addr = -1] }
-attach mainbus at root
+device	mainbus {[addr = -1]}
+attach	mainbus at root
 
-device pcc { [offset = -1], [ ipl = 0 ] }
-attach pcc at mainbus
-file arch/mvme68k/dev/pcc.c			pcc needs-count
+device	pcc {[offset = -1], [ipl = 0]}
+attach	pcc at mainbus
+file	arch/mvme68k/dev/pcc.c			pcc needs-count
 
-device pcctwo { [offset = -1], [ ipl = 0 ] }
-attach pcctwo at mainbus
-file arch/mvme68k/dev/pcctwo.c			pcctwo needs-count
+device	pcctwo {[offset = -1], [ipl = 0]}
+attach	pcctwo at mainbus
+file	arch/mvme68k/dev/pcctwo.c		pcctwo needs-count
 
-device mc { [offset = -1], [ ipl = 0 ] }
-attach mc at mainbus
-file arch/mvme68k/dev/mc.c			mc needs-count
+device	mc {[offset = -1], [ipl = 0]}
+attach	mc at mainbus
+file	arch/mvme68k/dev/mc.c			mc needs-count
 
-device clock
-attach clock at pcc, mc, pcctwo
-file arch/mvme68k/dev/clock.c			clock
+device	clock
+attach	clock at pcc, mc, pcctwo
+file	arch/mvme68k/dev/clock.c		clock
 
-device zs: tty
-attach zs at pcc, mc
-file arch/mvme68k/dev/zs.c			zs needs-count
+device	zs: tty
+attach	zs at pcc, mc
+file	arch/mvme68k/dev/zs.c			zs needs-count
 
-device cl: tty
-attach cl at pcctwo
-file arch/mvme68k/dev/cl.c			cl needs-count
+device	cl: tty
+attach	cl at pcctwo
+file	arch/mvme68k/dev/cl.c			cl needs-count
 
-device bugtty: tty
-attach bugtty at mainbus
-file arch/mvme68k/dev/bugtty.c			bugtty needs-count
-file arch/mvme68k/dev/bug.c			bugtty
+device	bugtty: tty
+attach	bugtty at mainbus
+file	arch/mvme68k/dev/bugtty.c		bugtty needs-count
+file	arch/mvme68k/dev/bug.c			bugtty
 
-device vme { }
-attach vme at pcc, mc, pcctwo
-device vmes { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
-attach vmes at vme
-device vmel { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
-attach vmel at vme
+device	vme {}
+attach	vme at pcc, mc, pcctwo
+device	vmes {[addr = -1], [len = -1], [vec = -1], [ipl = 0]}
+attach	vmes at vme
+device	vmel {[addr = -1], [len = -1], [vec = -1], [ipl = 0]}
+attach	vmel at vme
 file	arch/mvme68k/dev/vme.c			vme | vmes | vmel
 file	arch/mvme68k/dev/vmes.c			vmes needs-count
 file	arch/mvme68k/dev/vmel.c			vmel needs-count
 
 attach	le at pcc, vmes
-file    arch/mvme68k/dev/if_le.c		le
+file	arch/mvme68k/dev/if_le.c		le
 
-attach ie at mc, pcctwo
-file    arch/mvme68k/dev/if_ie.c		ie
+attach	ie at mc, pcctwo
+file	arch/mvme68k/dev/if_ie.c		ie
 
 include "../../../scsi/files.scsi"
 
-device wdsc: scsi
-attach wdsc at pcc
+device	wdsc: scsi
+attach	wdsc at pcc
 file	arch/mvme68k/dev/sbic.c			wdsc
 file	arch/mvme68k/dev/wdsc.c			wdsc
 
-device ipic { manu = -1, prod = -1, [vec = -1], [ipl = 0] }
-attach ipic at mc
+device	ipic {manu = -1, prod = -1, [vec = -1], [ipl = 0]}
+attach	ipic at mc
 file	arch/mvme68k/dev/ipic.c			ipic
 
-device fooip
-attach fooip at ipic
+device	fooip
+attach	fooip at ipic
 file	arch/mvme68k/dev/fooip.c		fooip
 
-device ssh: scsi
-attach ssh at mc, pcctwo
+device	ssh: scsi
+attach	ssh at mc, pcctwo
 file	arch/mvme68k/dev/sshdma.c		ssh
 file	arch/mvme68k/dev/ssh.c			ssh
 
-device memc
-attach memc at mc, pcctwo
+device	memc
+attach	memc at mc, pcctwo
 file	arch/mvme68k/dev/memc.c			memc
 
-device flash
-attach flash at mainbus
+device	flash
+attach	flash at mainbus
 file	arch/mvme68k/dev/flash.c		flash needs-count
 
-device sram
-attach sram at mainbus
-device nvram
-attach nvram at pcc, mc, pcctwo
+device	sram
+attach	sram at mainbus
+device	nvram
+attach	nvram at pcc, mc, pcctwo
 file	arch/mvme68k/dev/sram.c			sram needs-count
 file	arch/mvme68k/dev/nvram.c		nvram needs-count
 file	arch/mvme68k/dev/memdevs.c		nvram | sram
 
-device lp
-attach lp at pcc
+device	lp
+attach	lp at pcc
 file	arch/mvme68k/dev/lp.c			lp needs-count
 
-device lptwo
-attach lptwo at pcctwo
+device	lptwo
+attach	lptwo at pcctwo
 file	arch/mvme68k/dev/lptwo.c		lptwo needs-count
 
-#device xdc {target = -1}
-#attach xdc at vmes
-#device xd: disk
-#attach xd at xdc
+#device	xdc {target = -1}
+#attach	xdc at vmes
+#device	xd: disk
+#attach	xd at xdc
 #file	arch/mvme68k/dev/xd.c			xd needs-flag
 
-major { sd = 4 }
-major { cd = 6 }
-major { vnd = 8 }
-major { rd = 9 }
-#major { xd = 10 }
-
-file arch/mvme68k/mvme68k/autoconf.c
-file arch/mvme68k/mvme68k/conf.c
-file arch/mvme68k/mvme68k/disksubr.c
-file arch/mvme68k/mvme68k/dkbad.c
-file arch/mvme68k/mvme68k/machdep.c
-file arch/mvme68k/mvme68k/mem.c
-file arch/m68k/m68k/pmap_motorola.c
-file arch/mvme68k/mvme68k/pmap_bootstrap.c
-file arch/mvme68k/mvme68k/sys_machdep.c
-file arch/mvme68k/mvme68k/trap.c
-file arch/mvme68k/mvme68k/vm_machdep.c
-file dev/cninit.c
-
-file arch/m68k/m68k/db_memrw.c			ddb
+major	{sd = 4}
+major	{cd = 6}
+major	{vnd = 8}
+major	{rd = 9}
+#major	{xd = 10}
+
+file	arch/mvme68k/mvme68k/autoconf.c
+file	arch/mvme68k/mvme68k/conf.c
+file	arch/mvme68k/mvme68k/disksubr.c
+file	arch/mvme68k/mvme68k/dkbad.c
+file	arch/mvme68k/mvme68k/machdep.c
+file	arch/mvme68k/mvme68k/mem.c
+file	arch/m68k/m68k/pmap_motorola.c
+file	arch/mvme68k/mvme68k/pmap_bootstrap.c
+file	arch/mvme68k/mvme68k/sys_machdep.c
+file	arch/mvme68k/mvme68k/trap.c
+file	arch/mvme68k/mvme68k/vm_machdep.c
+file	dev/cninit.c
+
+file	arch/m68k/m68k/db_memrw.c		ddb
 
 # Compatibility modules
 
@@ -132,11 +132,11 @@ file arch/m68k/m68k/db_memrw.c			ddb
 include	"compat/hpux/m68k/files.hpux"
 file	arch/mvme68k/mvme68k/hpux_machdep.c	compat_hpux
 
-device wl: tty
-attach wl at vmes
-file arch/mvme68k/dev/wl.c			wl needs-count
+device	wl: tty
+attach	wl at vmes
+file	arch/mvme68k/dev/wl.c			wl needs-count
 
-device vs: scsi
-attach vs at vmes
+device	vs: scsi
+attach	vs at vmes
 file	arch/mvme68k/dev/vs.c			vs
 file	arch/mvme68k/dev/vsdma.c		vs
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index 67d0ea3f4df..5a237b53332 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,68 +1,68 @@
-#	$OpenBSD: files.mvme88k,v 1.34 2004/10/08 13:04:36 grange Exp $
+#	$OpenBSD: files.mvme88k,v 1.35 2005/03/08 20:00:23 tdeval Exp $
 #
 maxpartitions 16
 
-device 	mainbus { [addr = -1 ] }
-attach 	mainbus at root
+device	mainbus {[addr = -1]}
+attach	mainbus at root
 
-device bussw { [offset = -1], [ ipl = 0 ] }
-attach bussw at mainbus
+device	bussw {[offset = -1], [ipl = 0]}
+attach	bussw at mainbus
 file	arch/mvme88k/dev/bussw.c			bussw needs-count
 
-device pcctwo { [offset = -1], [ ipl = 0 ] }
-attach pcctwo at bussw, mainbus
+device	pcctwo {[offset = -1], [ipl = 0]}
+attach	pcctwo at bussw, mainbus
 file	arch/mvme88k/dev/pcctwo.c			pcctwo needs-count
 
-device syscon { [offset = -1], [ ipl = 0 ] }
-attach syscon at mainbus
+device	syscon {[offset = -1], [ipl = 0]}
+attach	syscon at mainbus
 file	arch/mvme88k/dev/syscon.c			syscon needs-count
 
-device clock
-attach clock at pcctwo, syscon
+device	clock
+attach	clock at pcctwo, syscon
 file	arch/mvme88k/dev/clock.c			clock
 
-device memc
-attach memc at pcctwo
+device	memc
+attach	memc at pcctwo
 file	arch/mvme88k/dev/memc.c				memc
 
-device sram
-attach sram at mainbus
+device	sram
+attach	sram at mainbus
 file	arch/mvme88k/dev/sram.c				sram needs-count
 
-device nvram
-attach nvram at pcctwo, syscon
+device	nvram
+attach	nvram at pcctwo, syscon
 file	arch/mvme88k/dev/nvram.c			nvram needs-count
 
-device cl: tty
-attach cl at pcctwo
+device	cl: tty
+attach	cl at pcctwo
 file	arch/mvme88k/dev/cl.c				cl needs-count
 
-device dart: tty
-attach dart at syscon
+device	dart: tty
+attach	dart at syscon
 file	arch/mvme88k/dev/dart.c				dart needs-count
 
 # fallback console, only if no cl or dart is available
-device bugtty: tty
-attach bugtty at mainbus
+device	bugtty: tty
+attach	bugtty at mainbus
 file	arch/mvme88k/dev/bugtty.c			bugtty needs-count
 
-include "../../../scsi/files.scsi"
+include	"../../../scsi/files.scsi"
 
-major { sd = 4 }
-major { st = 5 }
-major { cd = 6 }
-major { rd = 7 }
-major { vnd = 8 }
+major	{sd = 4}
+major	{st = 5}
+major	{cd = 6}
+major	{rd = 7}
+major	{vnd = 8}
 
-attach osiop at pcctwo with osiop_pcctwo
+attach	osiop at pcctwo with osiop_pcctwo
 file	arch/mvme88k/dev/osiop_pcctwo.c			osiop_pcctwo
 
-device vme { }
-attach vme at pcctwo, syscon
-device vmes { [addr = -1], [vec = -1], [ipl = 0] }
-attach vmes at vme
-device vmel { [addr = -1], [vec = -1], [ipl = 0] }
-attach vmel at vme
+device	vme {}
+attach	vme at pcctwo, syscon
+device	vmes {[addr = -1], [vec = -1], [ipl = 0]}
+attach	vmes at vme
+device	vmel {[addr = -1], [vec = -1], [ipl = 0]}
+attach	vmel at vme
 file	arch/mvme88k/dev/vme.c				vme | vmes | vmel
 file	arch/mvme88k/dev/vmes.c				vmes needs-count
 file	arch/mvme88k/dev/vmel.c				vmel needs-count
@@ -93,20 +93,20 @@ file	arch/mvme88k/dev/bugio.c
 file	arch/mvme88k/dev/mainbus.c
 file	arch/mvme88k/dev/memdevs.c			nvram | sram
 
-attach ie at pcctwo: ifnet, ether
-file    arch/mvme88k/dev/if_ie.c			ie
+attach	ie at pcctwo: ifnet, ether
+file	arch/mvme88k/dev/if_ie.c			ie
 
-attach le at vmes
-file    arch/mvme88k/dev/if_le.c			le
+attach	le at vmes
+file	arch/mvme88k/dev/if_le.c			le
 
-#device vp: ether, ifnet, ifmedia
-#attach vp at vmes
-#file    arch/mvme88k/dev/if_vp.c			vp
+#device	vp: ether, ifnet, ifmedia
+#attach	vp at vmes
+#file	arch/mvme88k/dev/if_vp.c			vp
 
-device vx: tty
-attach vx at vmes
+device	vx: tty
+attach	vx at vmes
 file	arch/mvme88k/dev/vx.c				vx needs-count
 
-device vs: scsi
-attach vs at vmes
+device	vs: scsi
+attach	vs at vmes
 file	arch/mvme88k/dev/vs.c				vs
diff --git a/sys/arch/mvmeppc/conf/files.mvmeppc b/sys/arch/mvmeppc/conf/files.mvmeppc
index 30050acd78d..96f206d1895 100644
--- a/sys/arch/mvmeppc/conf/files.mvmeppc
+++ b/sys/arch/mvmeppc/conf/files.mvmeppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvmeppc,v 1.8 2004/10/08 13:04:36 grange Exp $
+#	$OpenBSD: files.mvmeppc,v 1.9 2005/03/08 20:00:23 tdeval Exp $
 
 #
 # mvmeppc-specific configuration info
@@ -10,7 +10,7 @@ maxusers 2 8 64
 file	dev/cninit.c
 file	arch/mvmeppc/mvmeppc/db_interface.c
 
-file    arch/mvmeppc/dev/bugio.c
+file	arch/mvmeppc/dev/bugio.c
 file	arch/mvmeppc/dev/clock.c
 file	arch/mvmeppc/dev/mem.c
 
@@ -42,17 +42,17 @@ file	arch/mvmeppc/dev/openpic.c
 # Various things that need to be included early...
 
 # Media Independent Interface (mii)
-include "../../../dev/mii/files.mii"
+include	"../../../dev/mii/files.mii"
 
 # I2O
-include "../../../dev/i2o/files.i2o"
+include	"../../../dev/i2o/files.i2o"
 
 #
 # ISA Bus support
 #
 
-include "dev/isa/files.isa"
-include "dev/isa/files.isapnp"
+include	"dev/isa/files.isa"
+include	"dev/isa/files.isapnp"
 
 file	arch/mvmeppc/isa/isa_machdep.c		isa
 
@@ -60,7 +60,7 @@ file	arch/mvmeppc/isa/isa_machdep.c		isa
 # PCI bus support
 #
 
-include "dev/pci/files.pci"
+include	"dev/pci/files.pci"
 
 device	mpcpcibr {} : pcibus
 attach	mpcpcibr at raven
@@ -87,15 +87,15 @@ file	arch/mvmeppc/pci/pcib.c			pcib
 # Block Devices
 #
 
-include "../../../scsi/files.scsi"
+include	"../../../scsi/files.scsi"
 #include "../../../dev/atapiscsi/files.atapiscsi"
 #include "../../../dev/ata/files.ata"
 
-device bugtty: tty
-attach bugtty at mainbus
-file arch/mvmeppc/dev/bugtty.c			bugtty needs-flag
+device	bugtty: tty
+attach	bugtty at mainbus
+file	arch/mvmeppc/dev/bugtty.c		bugtty needs-flag
 
 #major	{wd = 0}
 major	{sd = 2}
 major	{cd = 3}
-major   {rd = 17}
+major	{rd = 17}
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 2a7da45a390..d2c11515e0c 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -1,7 +1,7 @@
-#	$OpenBSD: files.powerpc,v 1.37 2003/01/09 22:27:10 miod Exp $
+#	$OpenBSD: files.powerpc,v 1.38 2005/03/08 20:00:23 tdeval Exp $
 #
 
-file    arch/powerpc/powerpc/setjmp.S			ddb
+file	arch/powerpc/powerpc/setjmp.S			ddb
 file	arch/powerpc/powerpc/Locore.c
 file	arch/powerpc/powerpc/bcopy.c
 file	arch/powerpc/powerpc/copystr.c
diff --git a/sys/arch/sgi/conf/files.sgi b/sys/arch/sgi/conf/files.sgi
index 101f868d295..7ec60a82524 100644
--- a/sys/arch/sgi/conf/files.sgi
+++ b/sys/arch/sgi/conf/files.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sgi,v 1.8 2005/03/05 23:58:43 tdeval Exp $
+#	$OpenBSD: files.sgi,v 1.9 2005/03/08 20:00:24 tdeval Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -11,20 +11,20 @@ maxusers 2 8 64
 file	arch/sgi/sgi/autoconf.c
 file	arch/sgi/sgi/conf.c
 file	arch/sgi/sgi/machdep.c
-file	arch/sgi/sgi/sginode.c		tgt_origin200 | tgt_origin2000
-file	arch/sgi/dev/wscons_machdep.c	wsdisplay
+file	arch/sgi/sgi/sginode.c			tgt_origin200 | tgt_origin2000
+file	arch/sgi/dev/wscons_machdep.c		wsdisplay
 
 #
 # Media Indepedent Interface (mii)
 #
-include "dev/mii/files.mii"
+include	"dev/mii/files.mii"
 
 #
 #	Machine-independent ATAPI drivers
 #
 
-include "dev/atapiscsi/files.atapiscsi"
-include "dev/ata/files.ata"
+include	"dev/atapiscsi/files.atapiscsi"
+include	"dev/ata/files.ata"
 
 #
 #	System BUS types
@@ -40,7 +40,7 @@ attach	cpu at mainbus
 #
 #	O2 MACE localbus autoconfiguration devices
 #
-define	macebus { [sys = - 1], [base = -1 ], [irq = -1] }
+define	macebus {[sys = - 1], [base = -1], [irq = -1]}
 device	macebus
 attach	macebus at mainbus
 file	arch/sgi/localbus/macebus.c		macebus
@@ -49,7 +49,7 @@ file	arch/sgi/localbus/macectrl.S		macebus
 #
 #	Origin200/Origin2000 XBOW mux bridge
 #
-define	xbowmux { [sys = - 1], [base = -1 ], [irq = -1] }
+define	xbowmux {[sys = - 1], [base = -1], [irq = -1]}
 device	xbowmux
 attach	xbowmux at mainbus
 file	arch/sgi/localbus/xbowmux.c		xbowmux
@@ -71,9 +71,9 @@ include	"scsi/files.scsi"
 major	{sd = 0}
 major	{cd = 3}
 
-include "dev/i2o/files.i2o"
+include	"dev/i2o/files.i2o"
 
-include "dev/pci/files.pci"
+include	"dev/pci/files.pci"
 
 # Clock device
 device	clock
@@ -96,18 +96,18 @@ attach	mec at macebus
 file	arch/sgi/dev/if_mec.c			mec
 
 # Moosehead A/V Board audio
-device  mavb: audio
+device	mavb: audio
 attach	mavb at macebus
 file	arch/sgi/dev/mavb.c			mavb
 
 # Raster operations
-include "dev/rasops/files.rasops"
-include "dev/wsfont/files.wsfont"
+include	"dev/rasops/files.rasops"
+include	"dev/wsfont/files.wsfont"
 
 #
 #  wscons console
 #
-include "dev/wscons/files.wscons"
+include	"dev/wscons/files.wscons"
 
 #
 #	PCI Bus support
@@ -116,13 +116,13 @@ include "dev/wscons/files.wscons"
 #
 # Machine-independent USB drivers
 #
-include "dev/usb/files.usb"
+include	"dev/usb/files.usb"
 
 #
 # Specials.
 #
 # RAM disk for boot
-major {rd = 8}
+major	{rd = 8}
 
 #
 #	Common files
@@ -131,4 +131,3 @@ major {rd = 8}
 file	dev/cninit.c
 file	netinet/in_cksum.c
 file	netns/ns_cksum.c			ns
-
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 61f510bdff9..523a1fcc645 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.62 2005/03/03 09:45:20 miod Exp $
+#	$OpenBSD: files.sparc,v 1.63 2005/03/08 20:00:24 tdeval Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -9,113 +9,113 @@ maxpartitions 16
 
 maxusers 2 8 64
 
-device mainbus {}
-attach mainbus at root
+device	mainbus {}
+attach	mainbus at root
 
-device obio { [addr = -1], [level = -1] }
-attach obio at mainbus
+device	obio {[addr = -1], [level = -1]}
+attach	obio at mainbus
 
-device iommu {}
-attach iommu at mainbus
+device	iommu {}
+attach	iommu at mainbus
 file	arch/sparc/sparc/iommu.c		iommu
 
-device vme {}
-attach vme at iommu
+device	vme {}
+attach	vme at iommu
 
-device vmel { [addr = -1], [level = -1], [vect = -1] }
-attach vmel at mainbus, vme
-device vmes { [addr = -1], [level = -1], [vect = -1] }
-attach vmes at mainbus, vme
+device	vmel {[addr = -1], [level = -1], [vect = -1]}
+attach	vmel at mainbus, vme
+device	vmes {[addr = -1], [level = -1], [vect = -1]}
+attach	vmes at mainbus, vme
 file	arch/sparc/dev/obio.c		obio | vmel | vmes | vme
 
-device auxreg
-attach auxreg at mainbus, obio
+device	auxreg
+attach	auxreg at mainbus, obio
 file	arch/sparc/sparc/auxreg.c		auxreg needs-count
 
-device clock
-attach clock at mainbus, obio
+device	clock
+attach	clock at mainbus, obio
 
-device oclock
-attach oclock at obio
+device	oclock
+attach	oclock at obio
 
-device timer
-attach timer at mainbus, obio
+device	timer
+attach	timer at mainbus, obio
 
-device eeprom
-attach eeprom at obio
+device	eeprom
+attach	eeprom at obio
 file	arch/sparc/sparc/clock.c
 
-device power
-attach power at obio
+device	power
+attach	power at obio
 file	arch/sparc/dev/power.c			power needs-count
 
-device led
-attach led at mainbus, obio
+device	led
+attach	led at mainbus, obio
 file	arch/sparc/dev/led.c			led needs-count
 
-device cpu
-attach cpu at mainbus
+device	cpu
+attach	cpu at mainbus
 file	arch/sparc/sparc/cpu.c
 
-device memreg
-attach memreg at mainbus, obio
+device	memreg
+attach	memreg at mainbus, obio
 file	arch/sparc/sparc/memreg.c
 
-device zs {[channel = -1]}
-attach zs at mainbus, obio
+device	zs {[channel = -1]}
+attach	zs at mainbus, obio
 file	arch/sparc/dev/zs.c			zs needs-flag
 file	arch/sparc/dev/z8530sc.c		zs
 
-device fdc {}
-attach fdc at mainbus, obio
-device fd: disk
-attach fd at fdc
+device	fdc {}
+attach	fdc at mainbus, obio
+device	fd: disk
+attach	fd at fdc
 file	arch/sparc/dev/fd.c			fdc | fd needs-flag
 file	arch/sparc/sparc/bsd_fdintr.s		fdc
 
-device xbox {}
-device sbus { [slot = -1], [offset = -1] }
-attach sbus at mainbus, iommu, sbus, xbox
+device	xbox {}
+device	sbus {[slot = -1], [offset = -1]}
+attach	sbus at mainbus, iommu, sbus, xbox
 file	arch/sparc/dev/sbus.c			sbus
 
 # Sun specific files
-include "../../../dev/sun/files.sun"
+include	"../../../dev/sun/files.sun"
 
 #
 # Console (zs) related stuff
 #
 
-device zstty: tty
-attach zstty at zs
+device	zstty: tty
+attach	zstty at zs
 file	arch/sparc/dev/z8530tty.c		zstty needs-flag
 file	arch/sparc/dev/zs_kgdb.c		kgdb
 
-device zskbd: tty, wskbddev, sunkbd
-attach zskbd at zs
+device	zskbd: tty, wskbddev, sunkbd
+attach	zskbd at zs
 file	arch/sparc/dev/z8530kbd.c		zskbd needs-flag
 
 #
 # Media Independent Interface (mii)
 #
-include "../../../dev/mii/files.mii"
+include	"../../../dev/mii/files.mii"
 
 #
 # Machine-independent SCSI drivers
 #
-include "../../../scsi/files.scsi"
+include	"../../../scsi/files.scsi"
 
-major { sd = 7 }
-major { vnd = 8 }
-major { cd = 18 }
+major	{sd = 7}
+major	{vnd = 8}
+major	{cd = 18}
 major	{rd = 17}
 
-device dma {}
-attach dma at sbus, obio
-device ledma {}
-attach ledma at sbus
+device	dma {}
+attach	dma at sbus, obio
+device	ledma {}
+attach	ledma at sbus
 file	arch/sparc/dev/dma.c		dma | ledma
-device lebuffer {}
-attach lebuffer at sbus
+device	lebuffer {}
+attach	lebuffer at sbus
 file	arch/sparc/dev/lebuffer.c	lebuffer
 
 device	qec {}
@@ -131,29 +131,29 @@ attach	qe at qec
 file	arch/sparc/dev/qe.c		qe
 
 # HappyMeal (hme) ethernet
-device hme: ifnet, ether, mii, ifmedia
-attach hme at sbus
+device	hme: ifnet, ether, mii, ifmedia
+attach	hme at sbus
 file	arch/sparc/dev/hme.c		hme
 
-attach esp at sbus, dma, obio
+attach	esp at sbus, dma, obio
 file	arch/sparc/dev/esp.c		esp
 
-device audioamd: audio, mulaw
-attach audioamd at mainbus, obio, sbus
+device	audioamd: audio, mulaw
+attach	audioamd at mainbus, obio, sbus
 file	arch/sparc/dev/amd7930.c	audio
 file	arch/sparc/sparc/amd7930intr.s	audio
 
-device audiocs: audio, auconv
-attach audiocs at sbus
+device	audiocs: audio, auconv
+attach	audiocs at sbus
 file	arch/sparc/dev/cs4231.c		audiocs
 
 # Framebuffers
 
 file	arch/sparc/dev/fb.c
 
-include "dev/wscons/files.wscons"
-include "dev/rasops/files.rasops"
-include "dev/wsfont/files.wsfont"
+include	"dev/wscons/files.wscons"
+include	"dev/rasops/files.rasops"
+include	"dev/wsfont/files.wsfont"
 
 define	bt_dac
 file	arch/sparc/dev/bt_subr.c	bt_dac
@@ -233,30 +233,30 @@ attach	zx at sbus
 file	arch/sparc/dev/zx.c		zx
 
 # device definition in sys/conf/files
-attach le at sbus, ledma, lebuffer, obio
+attach	le at sbus, ledma, lebuffer, obio
 file	arch/sparc/dev/if_le.c		le
 
-attach ie at obio, vmes, vmel
+attach	ie at obio, vmes, vmel
 file	arch/sparc/dev/if_ie.c		ie
 
-device xdc {[drive = -1]}
-attach xdc at vmel
-device xd: disk
-attach xd at xdc
+device	xdc {[drive = -1]}
+attach	xdc at vmel
+device	xd: disk
+attach	xd at xdc
 file	arch/sparc/dev/xd.c		xd needs-flag
 major	{xd = 10}
 
-device xyc {[drive = -1]}
-attach xyc at vmes
-device xy: disk
-attach xy at xyc
+device	xyc {[drive = -1]}
+attach	xyc at vmes
+device	xy: disk
+attach	xy at xyc
 file	arch/sparc/dev/xy.c		xy needs-flag
 major	{xy = 3}
 
-device si: scsi, ncr5380sbc
-attach si at vmes
-device sw: scsi, ncr5380sbc
-attach sw at obio
+device	si: scsi, ncr5380sbc
+attach	si at vmes
+device	sw: scsi, ncr5380sbc
+attach	sw at obio
 file	arch/sparc/dev/si.c		si | sw
 
 # Efficient Networks, Inc. ATM interface
@@ -312,63 +312,63 @@ file	arch/sparc/sparc/db_disasm.c	ddb
 #
 
 # SVR4 Binary Compatibility (COMPAT_SVR4)
-include "../../../compat/svr4/files.svr4"
+include	"../../../compat/svr4/files.svr4"
 file	arch/sparc/sparc/svr4_machdep.c	compat_svr4
 file	arch/sparc/sparc/sunos_machdep.c compat_sunos
 
 # SunOS Binary Compatibility (COMPAT_SUNOS)
-include "../../../compat/sunos/files.sunos"
+include	"../../../compat/sunos/files.sunos"
 
 # Miscellaneous
 file	netns/ns_cksum.c		ns
 
 # Magma Serial/Parallel boards
-device magma {}
-attach magma at sbus                                 
-device mtty
-attach mtty at magma
-device mbpp
-attach mbpp at magma
-file    arch/sparc/dev/magma.c		magma | mtty | mbpp needs-flag
-
-device spif {}
-attach spif at sbus
-device stty
-attach stty at spif
-device sbpp
-attach sbpp at spif
+device	magma {}
+attach	magma at sbus
+device	mtty
+attach	mtty at magma
+device	mbpp
+attach	mbpp at magma
+file	arch/sparc/dev/magma.c		magma | mtty | mbpp needs-flag
+
+device	spif {}
+attach	spif at sbus
+device	stty
+attach	stty at spif
+device	sbpp
+attach	sbpp at spif
 file	arch/sparc/dev/spif.c		spif | stty | sbpp needs-flag
 
-device bpp {}
-attach bpp at sbus
-file    arch/sparc/dev/bpp.c		bpp needs-flag
+device	bpp {}
+attach	bpp at sbus
+file	arch/sparc/dev/bpp.c		bpp needs-flag
 
-attach xbox at sbus
+attach	xbox at sbus
 file	arch/sparc/dev/xbox.c		xbox
 
 # sysconfig registers on Force CPU-5V
-device scf {}
-attach scf at mainbus
+device	scf {}
+attach	scf at mainbus
 file	arch/sparc/dev/scf.c		scf needs-flag
 
 # flash memory on Force CPU-5V
-device flash {}
-attach flash at obio
+device	flash {}
+attach	flash at obio
 file	arch/sparc/dev/flash.c		flash needs-flag
 
 # VME/SBus bridge on Force CPU-5V
-device fga {}
-attach fga at iommu
-device fvme { [addr = -1], [level = -1], [vect = -1] }
-attach fvme at fga
+device	fga {}
+attach	fga at iommu
+device	fvme {[addr = -1], [level = -1], [vect = -1]}
+attach	fvme at fga
 file	arch/sparc/dev/fga.c		fga needs-flag
 
-device daadio {}
-attach daadio at fvme
+device	daadio {}
+attach	daadio at fvme
 file	arch/sparc/dev/daadio.c		daadio needs-flag
 
-device tctrl {}
-attach tctrl at obio
+device	tctrl {}
+attach	tctrl at obio
 file	arch/sparc/dev/tctrl.c		tctrl needs-flag
 
 # Prestoserve NVRAM
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index fba2af7a805..e65b7af88e0 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc64,v 1.56 2005/03/05 01:44:52 miod Exp $
+#	$OpenBSD: files.sparc64,v 1.57 2005/03/08 20:00:24 tdeval Exp $
 #	$NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
 
 # maxpartitions must be first item in files.${ARCH}
@@ -6,36 +6,36 @@ maxpartitions 16
 
 maxusers 2 8 1024
 
-define mainbus {}
-device mainbus: pcibus, mainbus
-attach mainbus at root
+define	mainbus {}
+device	mainbus: pcibus, mainbus
+attach	mainbus at root
 file	arch/sparc64/dev/upa.c			upa
 
-define upa {}
-device upa
-attach upa at mainbus
+define	upa {}
+device	upa
+attach	upa at mainbus
 
-define central {}
-device central
-attach central at mainbus
+define	central {}
+device	central
+attach	central at mainbus
 file	arch/sparc64/dev/central.c		central
 
-define fhc {}
-device fhc
+define	fhc {}
+device	fhc
 file	arch/sparc64/dev/fhc.c			fhc
 
-attach fhc at central with fhc_central
+attach	fhc at central with fhc_central
 file	arch/sparc64/dev/fhc_central.c		fhc_central
 
-attach fhc at mainbus with fhc_mainbus
+attach	fhc at mainbus with fhc_mainbus
 file	arch/sparc64/dev/fhc_mainbus.c		fhc_mainbus
 
-device clkbrd
-attach clkbrd at fhc
+device	clkbrd
+attach	clkbrd at fhc
 file	arch/sparc64/dev/clkbrd.c		clkbrd
 
-device pcons
-attach pcons at mainbus
+device	pcons
+attach	pcons at mainbus
 file	arch/sparc64/dev/pcons.c		pcons needs-flag
 
 # Sun HME Ethernet controllers
@@ -48,106 +48,106 @@ file	arch/sparc64/dev/uperf.c		uperf needs-flag
 # Framebuffer support
 
 file	arch/sparc64/dev/fb.c
-include "dev/wscons/files.wscons"
-include "dev/rasops/files.rasops"
-include "dev/wsfont/files.wsfont"
-
-include "dev/sbus/files.sbus"
-include "dev/i2o/files.i2o"
-include "dev/mii/files.mii"
-include "dev/atapiscsi/files.atapiscsi"
-include "dev/ata/files.ata"
-include "dev/pckbc/files.pckbc"
-include "dev/pcmcia/files.pcmcia"
+include	"dev/wscons/files.wscons"
+include	"dev/rasops/files.rasops"
+include	"dev/wsfont/files.wsfont"
+
+include	"dev/sbus/files.sbus"
+include	"dev/i2o/files.i2o"
+include	"dev/mii/files.mii"
+include	"dev/atapiscsi/files.atapiscsi"
+include	"dev/ata/files.ata"
+include	"dev/pckbc/files.pckbc"
+include	"dev/pcmcia/files.pcmcia"
 
 # COMPAT_NETBSD
-include "compat/netbsd/files.netbsd"
+include	"compat/netbsd/files.netbsd"
 file	arch/sparc64/sparc64/netbsd_machdep.c	compat_netbsd
 
 # Sun specific files
-include "../../../dev/sun/files.sun"
+include	"../../../dev/sun/files.sun"
 
 attach	sbus at mainbus with sbus_mb
 attach	sbus at xbox with sbus_xbox
 file	arch/sparc64/dev/sbus.c			sbus
 
-device creator: wsemuldisplaydev, rasops8, rasops16, rasops24, rasops32, wsemul_sun
+device	creator: wsemuldisplaydev, rasops8, rasops16, rasops24, rasops32, wsemul_sun
 file	arch/sparc64/dev/creator.c		creator
 
-attach creator at mainbus with creator_mainbus
+attach	creator at mainbus with creator_mainbus
 file	arch/sparc64/dev/creator_mainbus.c	creator_mainbus
 
-attach creator at upa with creator_upa
+attach	creator at upa with creator_upa
 file	arch/sparc64/dev/creator_upa.c		creator_upa
 
-include "dev/pci/files.pci"
-major { wd = 12 }
+include	"dev/pci/files.pci"
+major	{wd = 12}
 
-include "dev/puc/files.puc"
+include	"dev/puc/files.puc"
 
-device psycho: pcibus
-attach psycho at mainbus
+device	psycho: pcibus
+attach	psycho at mainbus
 file	arch/sparc64/dev/psycho.c		psycho
 
-device schizo: pcibus
-attach schizo at mainbus
+device	schizo: pcibus
+attach	schizo at mainbus
 file	arch/sparc64/dev/schizo.c		schizo
 file	arch/sparc64/dev/pci_machdep.c		psycho | schizo
 
 attach	hme at pci with hme_pci
 file	dev/pci/if_hme_pci.c			hme_pci
 
-device vgafb: wsemuldisplaydev, rasops8, rasops16, rasops24, rasops32, wsemul_sun
-attach vgafb at pci
+device	vgafb: wsemuldisplaydev, rasops8, rasops16, rasops24, rasops32, wsemul_sun
+attach	vgafb at pci
 file	arch/sparc64/dev/vgafb.c		vgafb
 
 # IOMMU is for both
 file	arch/sparc64/dev/iommu.c		sbus | psycho
 
-device ebus {[addr = -1]}: pcibus
-attach ebus at pci
+device	ebus {[addr = -1]}: pcibus
+attach	ebus at pci
 file	arch/sparc64/dev/ebus.c			ebus
 
 attach	uperf at ebus with uperf_ebus
 file	arch/sparc64/dev/uperf_ebus.c		uperf_ebus
 
-device clock: mk48txx
-attach clock at mainbus, sbus with clock_sbus
-attach clock at ebus with clock_ebus
-attach clock at fhc with clock_fhc
+device	clock: mk48txx
+attach	clock at mainbus, sbus with clock_sbus
+attach	clock at ebus with clock_ebus
+attach	clock at fhc with clock_fhc
 
-device rtc
-attach rtc at ebus with  rtc_ebus
+device	rtc
+attach	rtc at ebus with rtc_ebus
 
-device timer
-attach timer at mainbus, sbus
+device	timer
+attach	timer at mainbus, sbus
 
-device eeprom
-attach eeprom at sbus, ebus
+device	eeprom
+attach	eeprom at sbus, ebus
 file	arch/sparc64/sparc64/clock.c
 file	dev/clock_subr.c
 
-device cpu
-attach cpu at mainbus
+device	cpu
+attach	cpu at mainbus
 file	arch/sparc64/sparc64/cpu.c
 
-device auxio
-attach auxio at ebus with auxio_ebus
-attach auxio at sbus with auxio_sbus
+device	auxio
+attach	auxio at ebus with auxio_ebus
+attach	auxio at sbus with auxio_sbus
 file	arch/sparc64/dev/auxio.c		auxio
 
-device beeper
-attach beeper at ebus
+device	beeper
+attach	beeper at ebus
 file	arch/sparc64/dev/beeper.c		beeper
 
-device sab {}
-attach sab at ebus
-device sabtty
-attach sabtty at sab
+device	sab {}
+attach	sab at ebus
+device	sabtty
+attach	sabtty at sab
 file	arch/sparc64/dev/sab.c			sab | sabtty needs-flag
 
-device audioce: audio, auconv
-attach audioce at ebus
+device	audioce: audio, auconv
+attach	audioce at ebus
 file	arch/sparc64/dev/ce4231.c		audioce
 
 file	arch/sparc64/dev/stp_sbus.c		stp_sbus
@@ -156,32 +156,32 @@ file	arch/sparc64/dev/stp_sbus.c		stp_sbus
 # Console related stuff
 #
 
-attach com at ebus with com_ebus
+attach	com at ebus with com_ebus
 file	arch/sparc64/dev/com_ebus.c		com_ebus
 
-attach pckbc at ebus with pckbc_ebus
+attach	pckbc at ebus with pckbc_ebus
 file	arch/sparc64/dev/pckbc_ebus.c		pckbc_ebus
 
-device comkbd: tty, wskbddev, sunkbd
-attach comkbd at ebus
+device	comkbd: tty, wskbddev, sunkbd
+attach	comkbd at ebus
 file	arch/sparc64/dev/comkbd_ebus.c		comkbd
 
-attach lpt at ebus with lpt_ebus
+attach	lpt at ebus with lpt_ebus
 file	arch/sparc64/dev/lpt_ebus.c		lpt_ebus
 
-device zs {[channel = -1]}
-attach zs at sbus with zs_sbus
-attach zs at fhc with zs_fhc
+device	zs {[channel = -1]}
+attach	zs at sbus with zs_sbus
+attach	zs at fhc with zs_fhc
 file	arch/sparc64/dev/zs.c			zs needs-flag
 file	arch/sparc64/dev/z8530sc.c		zs
 
-define zstty {}
-device zstty: tty
-attach zstty at zs
+define	zstty {}
+device	zstty: tty
+attach	zstty at zs
 file	arch/sparc64/dev/z8530tty.c		zstty needs-flag
 
-device zskbd: tty, wskbddev, sunkbd
-attach zskbd at zs
+device	zskbd: tty, wskbddev, sunkbd
+attach	zskbd at zs
 file	arch/sparc64/dev/z8530kbd.c		zskbd needs-flag
 
 file	arch/sparc64/dev/consinit.c
@@ -233,13 +233,13 @@ file	arch/sparc64/dev/md_root.c	memory_disk_hooks
 #
 # Machine-independent SCSI drivers
 #
-include "../../../scsi/files.scsi"
-major { sd = 7 }
-major { vnd = 8 }
-major { cd = 18 }
-major { rd = 5 }
+include	"../../../scsi/files.scsi"
+major	{sd = 7}
+major	{vnd = 8}
+major	{cd = 18}
+major	{rd = 5}
 
 #
 # Machine-independent USB drivers
 #
-include "dev/usb/files.usb"
+include	"dev/usb/files.usb"
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index d4661044234..4c2c0a8c362 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,5 +1,5 @@
-#	$OpenBSD: files.vax,v 1.28 2004/10/08 13:04:36 grange Exp $
-#       $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
+#	$OpenBSD: files.vax,v 1.29 2005/03/08 20:00:24 tdeval Exp $
+#	$NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
 #
 # new style config file for vax architecture
 #
@@ -9,97 +9,97 @@ maxpartitions 16
 
 maxusers 2 8 64
 
-device	mainbus { }
+device	mainbus {}
 attach	mainbus at root
 
 # Define a bunch of devices, needed in more than one place.
 device	cpu
 device	mem
-device	mba { drive = -1 }
+device	mba {drive = -1}
 
 # SBI and related devices
-device	sbi { tr=-1 }
+device	sbi {tr = -1}
 attach	sbi at mainbus with sbi_mainbus
-file	arch/vax/vax/sbi.c		sbi
+file	arch/vax/vax/sbi.c			sbi
 
 attach	mem at sbi with mem_sbi
-file	arch/vax/vax/ka780.c		vax780 | mem_sbi
-file	arch/vax/vax/cfl.c		vax780 | mem_sbi
+file	arch/vax/vax/ka780.c			vax780 | mem_sbi
+file	arch/vax/vax/cfl.c			vax780 | mem_sbi
 
 # Abus and related devices
-device	abus { }
+device	abus {}
 attach	abus at mainbus
 attach	sbi at abus with sbi_abus
-file	arch/vax/vax/ka860.c		abus
-file	arch/vax/vax/crl.c		abus
+file	arch/vax/vax/ka860.c			abus
+file	arch/vax/vax/crl.c			abus
 
 # CMI and related devices
-device	cmi { tr=-1 }
+device	cmi {tr = -1}
 attach	cmi at mainbus
-file	arch/vax/vax/cmi.c		cmi
+file	arch/vax/vax/cmi.c			cmi
 
 attach	mem at cmi with mem_cmi
-file	arch/vax/vax/ka750.c		vax750 | mem_cmi
-file	arch/vax/vax/ctu.c		vax750 | mem_cmi
+file	arch/vax/vax/ka750.c			vax750 | mem_cmi
+file	arch/vax/vax/ctu.c			vax750 | mem_cmi
 
-device	vsbus { csr }
+device	vsbus {csr}
 attach	vsbus at mainbus
-file	arch/vax/vsa/vsbus.c		vsbus
+file	arch/vax/vsa/vsbus.c			vsbus
 file	arch/vax/vsa/vsbus_dma.c		vsbus
 
 # DEC SGEC Second Generation Ethernet Controller
-define  sgec
-file    arch/vax/if/sgec.c           sgec
+define	sgec
+file	arch/vax/if/sgec.c			sgec
 
-device	ibus { }
+device	ibus {}
 attach	ibus at mainbus
-file	arch/vax/vax/ibus.c		ibus
+file	arch/vax/vax/ibus.c			ibus
 
-device	ze:  sgec, ether, ifnet
+device	ze: sgec, ether, ifnet
 attach	ze at ibus with ze_ibus
-file	arch/vax/if/if_ze.c		ze_ibus
+file	arch/vax/if/if_ze.c			ze_ibus
 attach	ze at vsbus with ze_vsbus
-file	arch/vax/vsa/if_ze_vsbus.c	ze_vsbus
+file	arch/vax/vsa/if_ze_vsbus.c		ze_vsbus
 
 attach	le at ibus with le_ibus
-file	arch/vax/if/if_le.c		le_ibus
+file	arch/vax/if/if_le.c			le_ibus
 
 attach	mba at sbi with mba_sbi
 attach	mba at cmi with mba_cmi
-file	arch/vax/mba/mba.c		mba needs-flag
+file	arch/vax/mba/mba.c			mba needs-flag
 
-device  hp: disk
-attach  hp at mba
-file    arch/vax/mba/hp.c		hp needs-flag
+device	hp: disk
+attach	hp at mba
+file	arch/vax/mba/hp.c			hp needs-flag
 major	{hp = 0}
 
 device	ht: tape
 attach	ht at mba
-file	arch/vax/mba/ht.c		ht needs-flag
+file	arch/vax/mba/ht.c			ht needs-flag
 
 # Memory Disk for install floppy
-#file arch/vax/vax/md_root.c		memory_disk_hooks
+#file	arch/vax/vax/md_root.c			memory_disk_hooks
 #major	{md = 23}
 
 # MSCP device drivers
-include "arch/vax/mscp/files.mscp"
+include	"arch/vax/mscp/files.mscp"
 major	{ra = 9}
 
 # Unibus/Q22 bus definitions
-include "arch/vax/qbus/files.uba"
+include	"arch/vax/qbus/files.uba"
 
 attach	uba at ibus with uba_ibus
-file	arch/vax/uba/uba_ibus.c		uba_ibus
+file	arch/vax/uba/uba_ibus.c			uba_ibus
 attach	uba at sbi with uba_sbi
-file	arch/vax/uba/uba_sbi.c		uba_sbi
+file	arch/vax/uba/uba_sbi.c			uba_sbi
 attach	uba at cmi with uba_cmi
-file	arch/vax/uba/uba_cmi.c		uba_cmi
+file	arch/vax/uba/uba_cmi.c			uba_cmi
 
 # BI bus definitions
 #include "arch/vax/bi/files.bi"
 
 #attach	bi at mainbus with bi_mainbus
-#file	arch/vax/bi/bi_mainbus.c	bi_mainbus
+#file	arch/vax/bi/bi_mainbus.c		bi_mainbus
 
 # VAX CPUs at BI, do not belong in MI code.
 #attach	cpu at bi with cpu_bi
@@ -108,15 +108,15 @@ file	arch/vax/uba/uba_cmi.c		uba_cmi
 # TS11 at UBA
 device	ts: tape
 attach	ts at uba
-file	arch/vax/uba/ts.c		ts needs-flag
+file	arch/vax/uba/ts.c			ts needs-flag
 
 attach	dz at vsbus with dz_vsbus
-file	arch/vax/vsa/dz_ibus.c		dz_vsbus
+file	arch/vax/vsa/dz_ibus.c			dz_vsbus
 
 # RD-type disks at VS2000's onboard MFM-controller
-device	hdc { drive = -1 }
+device	hdc {drive = -1}
 attach	hdc at vsbus
-file	arch/vax/vsa/hdc9224.c		hdc | ry | hd needs-flag
+file	arch/vax/vsa/hdc9224.c			hdc | ry | hd needs-flag
 
 device	hd: disk
 attach	hd at hdc
@@ -129,10 +129,10 @@ major	{ry = 24}
 #
 # Bus-independent support for DEC devices
 #
-include "arch/vax/dec/files.dec"
+include	"arch/vax/dec/files.dec"
 
 # wscons files.
-include "dev/wscons/files.wscons"
+include	"dev/wscons/files.wscons"
 
 # RAM Disk for install floppy
 major	{rd = 23}
@@ -141,36 +141,36 @@ major	{rd = 23}
 # Machine-independent SCSI driver.
 #
 
-include "../../../scsi/files.scsi"
-major   { sd = 20 }
-major   { st = 21 }
-major   { cd = 22 }
+include	"../../../scsi/files.scsi"
+major	{sd = 20}
+major	{st = 21}
+major	{cd = 22}
 
 # builtin NCR5380 SCSI-controller on VAXstation 
 device	ncr: scsi, ncr5380sbc
 attach	ncr at vsbus
-file	arch/vax/vsa/ncr.c		ncr needs-flag
+file	arch/vax/vsa/ncr.c			ncr needs-flag
 
 # LANCE ethernet controller on VAXstation
 attach	le at vsbus with le_vsbus
-file	arch/vax/vsa/if_le_vsbus.c	le_vsbus
+file	arch/vax/vsa/if_le_vsbus.c		le_vsbus
 
 # Monochrome framebuffer on VS3100.
 device	smg: wsemuldisplaydev
 attach	smg at vsbus
-file	arch/vax/vsa/smg.c		smg needs-flag
+file	arch/vax/vsa/smg.c			smg needs-flag
 
 device	lkkbd: wskbddev 
 attach	lkkbd at dz with dzkbd
-file	arch/vax/dec/dzkbd.c		dzkbd needs-flag
+file	arch/vax/dec/dzkbd.c			dzkbd needs-flag
 
 device	lkms: wsmousedev
 attach	lkms at dz with dzms
-file	arch/vax/dec/dzms.c		dzms needs-flag
+file	arch/vax/dec/dzms.c			dzms needs-flag
 
 #device	lkc: qfont
 #attach	lkc at dz
-#file	arch/vax/vsa/lkc.c		lkc needs-flag
+#file	arch/vax/vsa/lkc.c			lkc needs-flag
 
 # These devices aren't tested (or even compiled!)
 # They are just included here to make some files happy ;)
@@ -179,133 +179,133 @@ file	arch/vax/dec/dzms.c		dzms needs-flag
 # Ikonas framebuffer
 device	ik
 attach	ik at uba
-file	arch/vax/uba/ik.c		ik needs-flag
+file	arch/vax/uba/ik.c			ik needs-flag
 
 device	vs
 attach	vs at uba
-file	arch/vax/uba/vs.c		vs needs-flag
+file	arch/vax/uba/vs.c			vs needs-flag
 
 # RK06/07 on UBA
 device	rk: disk
 attach	rk at uba
-file	arch/vax/uba/rk.c		rk needs-flag
+file	arch/vax/uba/rk.c			rk needs-flag
 
 # TM11/TE10 at UBA
 device	te: tape
 attach	te at uba
-file	arch/vax/uba/tm.c		te needs-flag
+file	arch/vax/uba/tm.c			te needs-flag
 
 # TU78 at MBA
 device	mu: tape
 attach	mu at mba
-file	arch/vax/mba/mt.c		mu needs-flag
+file	arch/vax/mba/mt.c			mu needs-flag
 
 # DMF32 on UBA
 device	dmf # XXX?
 attach	dmf at uba
-file	arch/vax/uba/dmf.c		dmf needs-flag
-file	arch/vax/uba/dmz.c		dmf needs-flag
+file	arch/vax/uba/dmf.c			dmf needs-flag
+file	arch/vax/uba/dmz.c			dmf needs-flag
 
 # DMZ32 on UBA
 device	dmz # XXX?
 attach	dmz at uba
-file	arch/vax/uba/dmx.c		dmz needs-flag
+file	arch/vax/uba/dmx.c			dmz needs-flag
 
 # DN-11 on UBA
 device	dn # XXX?
 attach	dn at uba
-file	arch/vax/uba/dn.c		dn needs-flag
+file	arch/vax/uba/dn.c			dn needs-flag
 
 # IDC (RB730) on UBA (VAX 11/730)
-device	idc { drive=-1 }
+device	idc {drive = -1}
 attach	idc at uba
 device	rb: disk
 attach	rb at idc
-file	arch/vax/uba/idc.c		rb needs-flag
+file	arch/vax/uba/idc.c			rb needs-flag
 
 # LP-11 at UBA
 device	lp
 attach	lp at uba
-file	arch/vax/uba/lp.c		lp needs-flag
+file	arch/vax/uba/lp.c			lp needs-flag
 
 # ???? at UBA
 device	lpa
 attach	lpa at uba
-file	arch/vax/uba/lpa.c		lpa needs-flag
+file	arch/vax/uba/lpa.c			lpa needs-flag
 
 # PS2 at UBA
 device	ps
 attach	ps at uba
-file	arch/vax/uba/ps.c		ps needs-flag
+file	arch/vax/uba/ps.c			ps needs-flag
 
 # RL02/RL11 at UBA
-#device	hl { drive=-1 }
+#device	hl {drive = -1}
 #attach	hl at uba
 #device	rl: disk
 #attach	rl at hl
-#file	arch/vax/uba/rl.c		rl needs-flag
+#file	arch/vax/uba/rl.c			rl needs-flag
 
 # SC-21/SC-31 at UBA
-device	sc { drive=-1 }
+device	sc {drive = -1}
 attach	sc at uba
 device	up: disk
 attach	up at sc
-file	arch/vax/uba/up.c		up needs-flag
+file	arch/vax/uba/up.c			up needs-flag
 
 # TU45 at UBA
-device	ut { drive=-1}
+device	ut {drive = -1}
 attach	ut at uba
 device	tj: tape
 attach	tj at ut
-file	arch/vax/uba/ut.c		tj needs-flag
+file	arch/vax/uba/ut.c			tj needs-flag
 
 # TU58/DECtape II
 device	uu: tape
 attach	uu at uba
-file	arch/vax/uba/uu.c		uu needs-flag
+file	arch/vax/uba/uu.c			uu needs-flag
 
 # Benson-Varian plotter at UBA
-device	va { drive=-1}
+device	va {drive = -1}
 attach	va at uba
 device	vz
 attach	vz at va
-file	arch/vax/uba/va.c		va needs-flag
+file	arch/vax/uba/va.c			va needs-flag
 
 # Versatec plotter at UBA
 device	vp
 attach	vp at uba
-file	arch/vax/uba/vp.c		vp needs-flag
+file	arch/vax/uba/vp.c			vp needs-flag
 
 # QVSS at UBA
 device	qv
 attach	qv at uba
-file	arch/vax/uba/qv.c		qv needs-flag
+file	arch/vax/uba/qv.c			qv needs-flag
 
 # Interlan NP100 at UBA
 device	np: ifnet
 attach	np at uba
-file	arch/vax/if/if_ix.c		np needs-flag
-file	arch/vax/uba/np.c		np needs-flag
+file	arch/vax/if/if_ix.c			np needs-flag
+file	arch/vax/uba/np.c			np needs-flag
 
 # ACC LH/DH IMP on UBA
 device	acc: ifnet
 attach	acc at uba
-file	arch/vax/if/if_acc.c		acc needs-flag
+file	arch/vax/if/if_acc.c			acc needs-flag
 
 # DR11C at UBA
 device	ct # XXX
 attach	ct at uba
-file	arch/vax/uba/ct.c		ct needs-flag
+file	arch/vax/uba/ct.c			ct needs-flag
 
 # A/D-converter on UBA
 device	ad
 attach	ad at uba
-file	arch/vax/uba/ad.c		ad needs-flag
+file	arch/vax/uba/ad.c			ad needs-flag
 
 # DH-11/DM-11 on UBA
 device	dh # XXX?
 attach	dh at uba
-file	arch/vax/uba/dh.c		dh needs-flag
+file	arch/vax/uba/dh.c			dh needs-flag
 
 # These are general files needed for compilation.
 file	dev/cninit.c
@@ -316,21 +316,21 @@ file	arch/vax/vax/clock.c
 file	arch/vax/vax/gencons.c	vax8600|vax8200|vax780|vax750|vax630|vax650|vax660|vax670|vax680
 file	arch/vax/vax/pmap.c
 file	arch/vax/vax/machdep.c
-file	arch/vax/vax/ka820.c		vax8200
-file	arch/vax/vax/crx.c		vax8200
-file	arch/vax/vax/ka630.c		vax630
-file	arch/vax/vax/ka410.c		vax410
-file	arch/vax/vax/ka43.c		vax43
-file	arch/vax/vax/ka46.c		vax46
-file	arch/vax/vax/ka48.c		vax48
-file	arch/vax/vax/ka49.c		vax49
-file	arch/vax/vax/ka53.c		vax53
-file	arch/vax/vax/emulate.s		insn_emulate
-file	arch/vax/vax/unimpl_emul.s	insn_emulate
-file	arch/vax/vax/ka650.c		vax650
-file	arch/vax/vax/ka660.c		vax660
-file	arch/vax/vax/ka670.c		vax670
-file	arch/vax/vax/ka680.c		vax680
+file	arch/vax/vax/ka820.c			vax8200
+file	arch/vax/vax/crx.c			vax8200
+file	arch/vax/vax/ka630.c			vax630
+file	arch/vax/vax/ka410.c			vax410
+file	arch/vax/vax/ka43.c			vax43
+file	arch/vax/vax/ka46.c			vax46
+file	arch/vax/vax/ka48.c			vax48
+file	arch/vax/vax/ka49.c			vax49
+file	arch/vax/vax/ka53.c			vax53
+file	arch/vax/vax/emulate.s			insn_emulate
+file	arch/vax/vax/unimpl_emul.s		insn_emulate
+file	arch/vax/vax/ka650.c			vax650
+file	arch/vax/vax/ka660.c			vax660
+file	arch/vax/vax/ka670.c			vax670
+file	arch/vax/vax/ka680.c			vax680
 file	arch/vax/vax/scb.c
 file	arch/vax/vax/conf.c
 file	arch/vax/vax/urem.s
@@ -341,42 +341,42 @@ file	arch/vax/vax/bus_mem.c
 file	arch/vax/vax/sgmap.c
 file	arch/vax/vax/vm_machdep.c
 file	arch/vax/vax/findcpu.c
-file    arch/vax/vax/random.s       
+file	arch/vax/vax/random.s
 file	arch/vax/vax/rootfil.c
 file	arch/vax/vax/autoconf.c
-file	arch/vax/vax/in_cksum.c		inet
-file	arch/vax/vax/ns_cksum.c		ns
-file	arch/vax/vax/disksubr.c		disk | tape
-file	arch/vax/vax/db_machdep.c	ddb
-file	arch/vax/vax/db_disasm.c	ddb
+file	arch/vax/vax/in_cksum.c			inet
+file	arch/vax/vax/ns_cksum.c			ns
+file	arch/vax/vax/disksubr.c			disk | tape
+file	arch/vax/vax/db_machdep.c		ddb
+file	arch/vax/vax/db_disasm.c		ddb
 file	arch/vax/vax/opcodes.c
-file	arch/vax/uba/uba_dma.c		uba
+file	arch/vax/uba/uba_dma.c			uba
 
 # builtin NCR53C95 SCSI Controller on VAXstation 4000 VLC/60/9x
-device asc: scsi, ncr53c9x
-attach asc at vsbus with asc_vsbus
-file	arch/vax/vsa/asc_vsbus.c	asc needs-flag
+device	asc: scsi, ncr53c9x
+attach	asc at vsbus with asc_vsbus
+file	arch/vax/vsa/asc_vsbus.c		asc needs-flag
 
-include "compat/ultrix/files.ultrix"
-include "compat/vax1k/files.vax1k"
+include	"compat/ultrix/files.ultrix"
+include	"compat/vax1k/files.vax1k"
 
 # Dom h{ra f}r vara kvar s} l{nge f}r vi se vilka vi beh|ver...
-#arch/vax/vax/dkbad.c         standard
-#arch/vax/vax/ka730.c         standard
-#arch/vax/vax/iidr.o          optional ii
-#arch/vax/vax/iidrsys.o       optional ii
-#arch/vax/vax/iidr_glob.o     optional ii
-#arch/vax/if/if_css.c         optional css imp device-driver
-#arch/vax/if/if_dp.c          optional dp device-driver
-#arch/vax/if/if_ddn.c         optional ddn device-driver
-#arch/vax/if/if_dmc.c         optional dmc device-driver
-#arch/vax/if/if_dmv.c         optional dmv device-driver
-#arch/vax/if/if_ec.c          optional ec device-driver
-#arch/vax/if/if_en.c          optional en device-driver
-#arch/vax/if/if_ex.c          optional ex device-driver
-#arch/vax/if/if_hdh.c         optional hdh device-driver
-#arch/vax/if/if_hy.c          optional hy device-driver
-#arch/vax/if/if_il.c          optional il device-driver
-#arch/vax/if/if_pcl.c         optional pcl device-driver
-#arch/vax/if/if_vv.c          optional vv device-driver
-#arch/vax/if/raw_hy.c         optional hy device-driver
+#arch/vax/vax/dkbad.c		standard
+#arch/vax/vax/ka730.c		standard
+#arch/vax/vax/iidr.o		optional ii
+#arch/vax/vax/iidrsys.o		optional ii
+#arch/vax/vax/iidr_glob.o	optional ii
+#arch/vax/if/if_css.c		optional css imp device-driver
+#arch/vax/if/if_dp.c		optional dp device-driver
+#arch/vax/if/if_ddn.c		optional ddn device-driver
+#arch/vax/if/if_dmc.c		optional dmc device-driver
+#arch/vax/if/if_dmv.c		optional dmv device-driver
+#arch/vax/if/if_ec.c		optional ec device-driver
+#arch/vax/if/if_en.c		optional en device-driver
+#arch/vax/if/if_ex.c		optional ex device-driver
+#arch/vax/if/if_hdh.c		optional hdh device-driver
+#arch/vax/if/if_hy.c		optional hy device-driver
+#arch/vax/if/if_il.c		optional il device-driver
+#arch/vax/if/if_pcl.c		optional pcl device-driver
+#arch/vax/if/if_vv.c		optional vv device-driver
+#arch/vax/if/raw_hy.c		optional hy device-driver
diff --git a/sys/arch/vax/dec/files.dec b/sys/arch/vax/dec/files.dec
index 921a5580518..829b7ee4c0d 100644
--- a/sys/arch/vax/dec/files.dec
+++ b/sys/arch/vax/dec/files.dec
@@ -1,7 +1,7 @@
-#	$OpenBSD: files.dec,v 1.1 2001/05/16 22:15:17 hugh Exp $
-#       $NetBSD: files.dec,v 1.4 1999/08/04 07:17:51 nisimura Exp $
+#	$OpenBSD: files.dec,v 1.2 2005/03/08 20:00:24 tdeval Exp $
+#	$NetBSD: files.dec,v 1.4 1999/08/04 07:17:51 nisimura Exp $
 #
-# Config file and device description for  machine-independent
+# Config file and device description for machine-independent
 # code for devices for Digital Equipment Corp. systems.
 # Included by ports that need it.
 
@@ -9,9 +9,9 @@
 # which need it should specify the le_de_subr attribute.
 define	le_dec_subr
 
-#  DMA copy functions.  Lance attachments qhich Decices
+# DMA copy functions.
 file	arch/vax/dec/if_le_dec.c		le_dec_subr
 
-#  LK201 keyboard
-file	arch/vax/dec/lk201_ws.c		lkkbd
-file	arch/vax/dec/wskbdmap_lk201.c	lkkbd
+# LK201 keyboard
+file	arch/vax/dec/lk201_ws.c			lkkbd
+file	arch/vax/dec/wskbdmap_lk201.c		lkkbd
diff --git a/sys/arch/vax/qbus/files.uba b/sys/arch/vax/qbus/files.uba
index 673fce57059..38a6a77029d 100644
--- a/sys/arch/vax/qbus/files.uba
+++ b/sys/arch/vax/qbus/files.uba
@@ -1,20 +1,20 @@
-#	$OpenBSD: files.uba,v 1.2 2001/05/16 22:15:18 hugh Exp $
+#	$OpenBSD: files.uba,v 1.3 2005/03/08 20:00:24 tdeval Exp $
 #	$NetBSD: files.uba,v 1.6 1999/06/20 18:09:22 ragge Exp $
 #
 # Config file and device description for machine-independent
 # code for devices Digital Equipment Corp. Unibus and Q22 bus.
 # Included by ports that need it.
-device	uba { csr }
+device	uba {csr}
 
 define	qfont
 
 file	arch/vax/qbus/uba.c				uba
 
 # DZ-11 (-compatible) tty device driver.
-device	dz { line = -1 }: tty
+device	dz {line = -1}: tty
 attach	dz at uba with dz_uba
 file	arch/vax/qbus/dz.c				dz needs-flag
-file	arch/vax/qbus/dz_uba.c			dz_uba
+file	arch/vax/qbus/dz_uba.c				dz_uba
 
 # DL-11 at UBA
 device	dl: tty
@@ -36,12 +36,12 @@ file	arch/vax/qbus/uda.c				uda | mtc
 # DEQNA/DELQA Ethernet controller
 device	qe: ifnet, ether
 attach	qe at uba
-file	arch/vax/if/if_qe.c			qe
+file	arch/vax/if/if_qe.c				qe
 
 # DEUNA/DELUA Ethernet controller
 device	de: ifnet, ether
 attach	de at uba
-file	arch/vax/if/if_de.c			de
+file	arch/vax/if/if_de.c				de
 
 # QDSS at UBA
 device	qd: qfont
@@ -49,4 +49,4 @@ attach	qd at uba
 file	arch/vax/qbus/qd.c				qd needs-count
 
 # Fontfile for DEC framebuffers, soon to die in favour for MI fontfiles.
-file	arch/vax/qbus/qfont.c			qfont
+file	arch/vax/qbus/qfont.c				qfont
diff --git a/sys/compat/bsdos/files.bsdos b/sys/compat/bsdos/files.bsdos
index 7029fbf78c2..881ba088f94 100644
--- a/sys/compat/bsdos/files.bsdos
+++ b/sys/compat/bsdos/files.bsdos
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.bsdos,v 1.3 1999/11/13 22:13:00 millert Exp $
+#	$OpenBSD: files.bsdos,v 1.4 2005/03/08 20:00:24 tdeval Exp $
 #
 # Config file description for machine-independent BSD/OS compat code.
 # Included by ports that need it.
@@ -7,6 +7,6 @@
 # own file lists.
 
 file	compat/bsdos/bsdos_exec.c		compat_bsdos
-file    compat/bsdos/bsdos_ioctl.c		compat_bsdos
+file	compat/bsdos/bsdos_ioctl.c		compat_bsdos
 file	compat/bsdos/bsdos_sysent.c		compat_bsdos
 file	compat/bsdos/bsdos_syscalls.c		compat_bsdos & syscall_debug
diff --git a/sys/conf/files b/sys/conf/files
index 592af377dfa..41132241504 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.330 2005/03/05 23:58:43 tdeval Exp $
+#	$OpenBSD: files,v 1.331 2005/03/08 20:00:24 tdeval Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -13,7 +13,7 @@ define	audio {}
 define	scsi {}
 define	ifmedia
 define	mii {[phy = -1]}
-define	midibus { }
+define	midibus {}
 define	midisyn
 define	radiobus {}
 define	i2cbus {}
@@ -98,20 +98,20 @@ file	dev/ic/mk48txx.c		mk48txx
 
 # VGA graphics
 device	vga: wsemuldisplaydev, pcdisplayops
-file	dev/ic/vga.c		vga & (vga_pci | vga_isa)	needs-flag
-file	dev/ic/vga_subr.c	vga & (vga_pci | vga_isa)	needs-flag
+file	dev/ic/vga.c			vga & (vga_pci | vga_isa) needs-flag
+file	dev/ic/vga_subr.c		vga & (vga_pci | vga_isa) needs-flag
 
 # Attribute for devices that read/write an IEEE 802.3u MII bus using the
 # bit-bang method.
 define	mii_bitbang
-file	dev/mii/mii_bitbang.c	mii_bitbang
+file	dev/mii/mii_bitbang.c		mii_bitbang
 
 define	wdc_base
 define	ata {[channel = -1], [drive = -1]}
 define	atapi {[channel = -1]}
 # Common code for ESDI/IDE/etc. controllers
 device	wdc: ata, atapi, wdc_base
-file	dev/ic/wdc.c wdc_base
+file	dev/ic/wdc.c			wdc_base
 
 # "Chipset" drivers.  These are the bus-independent routines which
 # contain the cfdrivers.  Attachments are provided by files.<bus>
@@ -133,15 +133,15 @@ file	dev/ic/aic6360.c	aic & (aic_isa | aic_pcmcia | aic_isapnp)
 
 # DPT EATA SCSI controllers
 device	dpt: scsi
-file	dev/ic/dpt.c		dpt
+file	dev/ic/dpt.c			dpt
 
 # AdvanSys 1200A, 1200B and ULTRA SCSI controllers
 device	adv: scsi
-file	dev/ic/adv.c		adv
+file	dev/ic/adv.c			adv
 
 # AdvanSys ULTRA WIDE SCSI controllers
 device	adw: scsi
-file	dev/ic/adw.c		adw
+file	dev/ic/adw.c			adw
 
 # BusLogic MultiMaster and MultiMaster Ultra SCSI controllers
 device	bha: scsi
@@ -149,23 +149,23 @@ file	dev/ic/bha.c		bha & (bha_pci | bha_isa | bha_eisa) needs-flag
 
 # ICP Vortex GDT RAID controllers
 device	gdt: scsi
-file	dev/ic/gdt_common.c	gdt
+file	dev/ic/gdt_common.c		gdt
 
 # 3ware Escalade RAID controllers
 device	twe: scsi
-file	dev/ic/twe.c		twe
+file	dev/ic/twe.c			twe
 
 # LSI64854 DMA controller back-end
 define	lsi64854
-file	dev/ic/lsi64854.c	lsi64854
+file	dev/ic/lsi64854.c		lsi64854
 
 # Compaq Smart ARRAY controllers
 device	cac: scsi
-file	dev/ic/cac.c		cac
+file	dev/ic/cac.c			cac
 
 # AMI MegaRAID controllers
 device	ami: scsi
-file	dev/ic/ami.c		ami
+file	dev/ic/ami.c			ami
 
 # Qlogic ISP 10x0 SCSI Controllers
 device	isp: scsi
@@ -174,19 +174,19 @@ file	dev/ic/isp_openbsd.c		isp
 
 # LSILogic Fusion-MPT I/O Processor SCSI/FC Controllers
 #
-device  mpt: scsi
-file    dev/ic/mpt.c			mpt
-file    dev/ic/mpt_debug.c		mpt
-file    dev/ic/mpt_openbsd.c		mpt
+device	mpt: scsi
+file	dev/ic/mpt.c			mpt
+file	dev/ic/mpt_debug.c		mpt
+file	dev/ic/mpt_openbsd.c		mpt
 
 # UltraStor SCSI controllers
 device	uha: scsi
-file	dev/ic/uha.c		uha
+file	dev/ic/uha.c			uha
 
 # NCR 53c9x or Emulex ESP SCSI Controller
 define	ncr53c9x
 device	esp: scsi, ncr53c9x
-file	dev/ic/ncr53c9x.c	ncr53c9x
+file	dev/ic/ncr53c9x.c		ncr53c9x
 
 # common stuff for siop and esiop
 define	siop_common
@@ -206,91 +206,95 @@ file	dev/ic/oosiop.c			oosiop & (oosiop_gsc)
 
 # 3Com Etherlink-III Ethernet controller
 device	ep: ether, ifnet, ifmedia, mii
-file	dev/ic/elink3.c		ep
+file	dev/ic/elink3.c			ep
 
 # LEMAC-based cards
 device	lc: ether, ifnet, ifmedia
-file	dev/ic/lemac.c		lc
+file	dev/ic/lemac.c			lc
 
 # WaveLan
 device	wi: ether, ifnet, ifmedia
-file	dev/ic/if_wi.c		wi
-file	dev/ic/if_wi_hostap.c	wi
+file	dev/ic/if_wi.c			wi
+file	dev/ic/if_wi_hostap.c		wi
 
 # Aironet 802.11 DS Ethernet controller
 device	an: ether, ifnet, ifmedia
-file	dev/ic/an.c		an
+file	dev/ic/an.c			an
 
 # RangeLAN2
 device	rln: ether, ifnet
-file	dev/ic/rln.c		rln
-file	dev/ic/rlnsubr.c	rln
+file	dev/ic/rln.c			rln
+file	dev/ic/rlnsubr.c		rln
 
 # LANCE and PCnet Ethernet controllers
 device	le: ether, ifnet, ifmedia
-file	dev/ic/am7990.c		le
+file	dev/ic/am7990.c			le
 
 # 3Com 3c9xx
 device	xl: ether, ifnet, ifmedia, mii
-file	dev/ic/xl.c		xl
+file	dev/ic/xl.c			xl
 
 # Intel EtherExpress PRO 10/100B
 device	fxp: ether, ifnet, ifmedia, mii, firmload
-file	dev/ic/fxp.c		fxp
+file	dev/ic/fxp.c			fxp
 
 # Myson MTD803
 device	mtd: ether, ifnet, ifmedia, mii
-file	dev/ic/mtd8xx.c		mtd
+file	dev/ic/mtd8xx.c			mtd
 
 # RealTek 8129/8139
 device	rl: ether, ifnet, ifmedia, mii
-file	dev/ic/rtl81x9.c	rl
+file	dev/ic/rtl81x9.c		rl
 
 # Realtek 8169
 device	re: ether, ifnet, ifmedia, mii
-file	dev/ic/re.c		re
+file	dev/ic/re.c			re
 
 # Clones of Digital 2104x
 device	dc: ether, ifnet, ifmedia, mii
-file	dev/ic/dc.c		dc
+file	dev/ic/dc.c			dc
 
 # SMC 91Cxx Ethernet Controller
 device	sm: ether, ifnet, ifmedia
-file	dev/ic/smc91cxx.c	sm
+file	dev/ic/smc91cxx.c		sm
 
 # Novell NE2000-compatible Ethernet cards, based on the
 # National Semiconductor DS8390.
 device	ne: ether, ifnet, dp8390nic, ifmedia, mii
-file	dev/ic/ne2000.c		ne
+file	dev/ic/ne2000.c			ne
 
 # D-Link DL10019/10022 NE2000-compatible network interface subroutines
-file	dev/ic/dl10019.c	dl10019
+file	dev/ic/dl10019.c		dl10019
 
 # ASIX AX88190 NE2000-compatible network interface subroutines
-file	dev/ic/ax88190.c	ax88190
+file	dev/ic/ax88190.c		ax88190
 
 # Intel i82596/i82586 Ethernet Controller
 device	ie: ether, ifnet, ifmedia
-file	dev/ic/i82596.c		ie & (ie_pci | ie_eisa | ie_gsc)
+file	dev/ic/i82596.c			ie & (ie_pci | ie_eisa | ie_gsc)
 
 # Sun GEM Ethernet controllers
 device	gem: ether, ifnet, ifmedia, mii
-file	dev/ic/gem.c		gem
+file	dev/ic/gem.c			gem
 
 # TROPIC Token-Ring controller
 device	tr: ether, token, ifnet
-file	dev/ic/tropic.c		tr
+file	dev/ic/tropic.c			tr
 
 # 8250/16[45]50-based "com" ports
 device	com: tty
-file	dev/ic/com.c		com & (com_isa | com_isapnp | com_commulti | com_pcmcia | com_localbus | com_gsc | com_puc | com_ebus | com_dino) needs-flag
+file	dev/ic/com.c			com & (com_isa | com_isapnp |
+					       com_commulti | com_pcmcia |
+					       com_localbus | com_gsc |
+					       com_puc | com_ebus |
+					       com_dino) needs-flag
 
 # PC-like keyboard controller
-device	pckbc { [slot = -1] }
-file	dev/ic/pckbc.c		pckbc needs-flag
+device	pckbc {[slot = -1]}
+file	dev/ic/pckbc.c			pckbc needs-flag
 
 # HPPA PS/2 input ports (forward definition)
-device	gsckbc { [slot = -1] }
+device	gsckbc {[slot = -1]}
 
 # OPL2/OPL3 FM synth driver
 device	opl: midibus, midisyn
@@ -303,63 +307,66 @@ file	dev/ic/ac97.c			ac97
 
 # Cyclades Cyclom multiport serial cards
 device	cy: tty
-file	dev/ic/cy.c		cy & (cy_isa | cy_pci)	needs-flag
+file	dev/ic/cy.c			cy & (cy_isa | cy_pci)	needs-flag
 
 # PC parallel ports (IEEE 1284)
 device	lpt
-file	dev/ic/lpt.c		lpt & (lpt_isa | lpt_localbus | lpt_gsc | lpt_puc | lpt_apio | lpt_ebus) needs-flag
+file	dev/ic/lpt.c			lpt & (lpt_isa | lpt_localbus |
+					       lpt_gsc | lpt_puc | lpt_apio |
+					       lpt_ebus) needs-flag
 
 # STI (hp graphics)
 device	sti: wsemuldisplaydev
-file	dev/ic/sti.c		sti & (sti_pci | sti_gedoens | sti_sgc) needs-flag
+file	dev/ic/sti.c			sti & (sti_pci | sti_gedoens |
+					       sti_sgc) needs-flag
 
 # Initio ULTRA WIDE/ULTRA2 WIDE SCSI Controllers
 device	iha: scsi
-file	dev/ic/iha.c		iha
+file	dev/ic/iha.c			iha
 
 # Tekram TRM-S1040 SCSI Cards (DC395U/UW/F,DC315/U)
 device	trm: scsi
-file	dev/ic/trm.c		trm
+file	dev/ic/trm.c			trm
 
 # National Semiconductor LM7[89] and compatible hardware monitors
 device	lm
-file	dev/ic/nslm7x.c		lm
+file	dev/ic/nslm7x.c			lm
 
 # Atheros AR5k (802.11/a/b/g) Hardware Abstraction Layer
-define  ar5xxx
-file	dev/ic/ar5xxx.c		ar5xxx
-file	dev/ic/ar5210.c		ar5xxx
-file	dev/ic/ar5211.c		ar5xxx
-file	dev/ic/ar5212.c		ar5xxx
+define	ar5xxx
+file	dev/ic/ar5xxx.c			ar5xxx
+file	dev/ic/ar5210.c			ar5xxx
+file	dev/ic/ar5211.c			ar5xxx
+file	dev/ic/ar5212.c			ar5xxx
 
 # Atheros AR5k (802.11/a/b/g) driver
 device	ath: ether, ifnet, ifmedia, ar5xxx, wlan, gpiobus
-file	dev/ic/ath.c		ath
+file	dev/ic/ath.c			ath
 
 # ADMtek ADM8211 802.11
 device	atw: ether, ifnet, ifmedia, smc93cx6, wlan
-file	dev/ic/atw.c		atw
+file	dev/ic/atw.c			atw
 
 # Realtek RTL8180 802.11
 device	rtw: ether, ifnet, ifmedia, smc93cx6, wlan
-file	dev/ic/rtw.c		rtw
-file	dev/ic/rtwphy.c		rtw
-file	dev/ic/rtwphyio.c	rtw
+file	dev/ic/rtw.c			rtw
+file	dev/ic/rtwphy.c			rtw
+file	dev/ic/rtwphyio.c		rtw
 
 # Ralink RT2500 802.11
 device	ral: ether, ifnet, ifmedia, wlan
-file	dev/ic/ral.c		ral
+file	dev/ic/ral.c			ral
 
 # Attributes which machine-independent bus support can be attached to.
 # These should be defined here, because some of these busses can have
 # devices which provide these attributes, and we'd like to avoid hairy
 # ordering constraints on inclusion of the busses' "files" files.
-define	isabus { }			# ISA attachment
-define	eisabus { }			# EISA attachment
+define	isabus {}			# ISA attachment
+define	eisabus {}			# EISA attachment
 define	pcibus {[bus = -1]}		# PCI attachment
-define	tcbus { }			# TurboChannel attachment
-define	usbus { }			# USB attachment
-define	pcmciabus { [controller = -1], [socket = -1]}	# PCMCIA attachment
+define	tcbus {}			# TurboChannel attachment
+define	usbus {}			# USB attachment
+define	pcmciabus {[controller = -1], [socket = -1]}	# PCMCIA attachment
 define	cbbus {[slot = -1]}		# CardBus attachment
 define	pcmciaslot {[slot = -1]}	# PCMCIA slot itself
 
@@ -410,28 +417,28 @@ pseudo-device sequencer
 pseudo-device systrace
 
 pseudo-device ksyms
-file	dev/ksyms.c	ksyms needs-flag
+file	dev/ksyms.c			ksyms needs-flag
 
 pseudo-device pf: ifnet
-file	net/pf.c		pf	needs-flag
-file	net/pf_norm.c		pf
-file	net/pf_ioctl.c		pf
-file	net/pf_table.c		pf
-file	net/pf_osfp.c		pf
-file	net/pf_if.c		pf
+file	net/pf.c			pf	needs-flag
+file	net/pf_norm.c			pf
+file	net/pf_ioctl.c			pf
+file	net/pf_table.c			pf
+file	net/pf_osfp.c			pf
+file	net/pf_if.c			pf
 pseudo-device pflog: ifnet
-file	net/if_pflog.c		pflog	needs-flag
+file	net/if_pflog.c			pflog	needs-flag
 pseudo-device pfsync: ifnet
-file	net/if_pfsync.c		pfsync	needs-flag
+file	net/if_pfsync.c			pfsync	needs-flag
 
 pseudo-device bio
-file	dev/bio.c	bio needs-flag
+file	dev/bio.c			bio needs-flag
 
 pseudo-device hotplug
-file	dev/hotplug.c		hotplug	needs-flag
+file	dev/hotplug.c			hotplug	needs-flag
 
 pseudo-device pppoe: ifnet, ether, sppp
-file 	net/if_pppoe.c		pppoe	needs-flag
+file 	net/if_pppoe.c			pppoe	needs-flag
 
 
 # XXX machine-independent SCSI files should live somewhere here, maybe
@@ -831,7 +838,7 @@ file nfs/krpc_subr.c			nfsclient
 file nfs/nfs_bio.c			nfsclient
 file nfs/nfs_boot.c			nfsclient
 file nfs/nfs_node.c			nfsclient
-file nfs/nfs_kq.c                       nfsclient
+file nfs/nfs_kq.c			nfsclient
 file nfs/nfs_serv.c			nfsserver
 file nfs/nfs_socket.c			nfsserver | nfsclient
 file nfs/nfs_srvcache.c			nfsserver
diff --git a/sys/dev/atapiscsi/files.atapiscsi b/sys/dev/atapiscsi/files.atapiscsi
index a95d16dd56b..5ce121dd0b8 100644
--- a/sys/dev/atapiscsi/files.atapiscsi
+++ b/sys/dev/atapiscsi/files.atapiscsi
@@ -1,8 +1,8 @@
-#      $OpenBSD: files.atapiscsi,v 1.4 2000/08/09 07:51:18 csapuntz Exp $     
-# ATAPI transport for SCSI protocl
+#	$OpenBSD: files.atapiscsi,v 1.5 2005/03/08 20:00:24 tdeval Exp $
+# ATAPI transport for SCSI protocol
 #
 
-device  atapiscsi: scsi
-attach  atapiscsi at atapi
-file    dev/atapiscsi/atapiscsi.c 	atapiscsi needs-flag
+device	atapiscsi: scsi
+attach	atapiscsi at atapi
+file	dev/atapiscsi/atapiscsi.c 	atapiscsi needs-flag
 
diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus
index 74fe04ebd67..19ca48b614e 100644
--- a/sys/dev/cardbus/files.cardbus
+++ b/sys/dev/cardbus/files.cardbus
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.cardbus,v 1.15 2005/03/05 23:58:43 tdeval Exp $
+#	$OpenBSD: files.cardbus,v 1.16 2005/03/08 20:00:24 tdeval Exp $
 #	$NetBSD: files.cardbus,v 1.8 2000/01/26 06:37:24 thorpej Exp $
 #
 # files.cardbus
@@ -6,14 +6,14 @@
 
 device	cardslot: cbbus, pcmciabus
 attach	cardslot at pcmciaslot
-file	dev/cardbus/cardslot.c		cardslot	needs-flag
+file	dev/cardbus/cardslot.c			cardslot	needs-flag
 
 device	cardbus {[dev = -1], [function = -1]}
 attach	cardbus at cbbus
-file	dev/cardbus/cardbus.c		cardbus		needs-flag
-file	dev/cardbus/cardbus_map.c	cardbus
-file	dev/cardbus/cardbus_exrom.c	cardbus
-file	dev/cardbus/rbus.c		cardbus
+file	dev/cardbus/cardbus.c			cardbus		needs-flag
+file	dev/cardbus/cardbus_map.c		cardbus
+file	dev/cardbus/cardbus_exrom.c		cardbus
+file	dev/cardbus/rbus.c			cardbus
 
 # Com ports
 attach	com at cardbus with com_cardbus
@@ -63,8 +63,8 @@ file	dev/cardbus/if_atw_cardbus.c		atw_cardbus
 
 # Realtek RTL8180
 #
-attach  rtw at cardbus with rtw_cardbus
-file    dev/cardbus/if_rtw_cardbus.c            rtw_cardbus
+attach	rtw at cardbus with rtw_cardbus
+file	dev/cardbus/if_rtw_cardbus.c		rtw_cardbus
 
 #
 # Ralink RT2500
diff --git a/sys/dev/dec/files.dec b/sys/dev/dec/files.dec
index 16b94890e61..a7156e84736 100644
--- a/sys/dev/dec/files.dec
+++ b/sys/dev/dec/files.dec
@@ -1,7 +1,7 @@
-#	$OpenBSD: files.dec,v 1.1 2002/05/02 22:56:02 miod Exp $
+#	$OpenBSD: files.dec,v 1.2 2005/03/08 20:00:24 tdeval Exp $
 #	$NetBSD: files.dec,v 1.7 2002/03/13 15:18:22 ad Exp $
 #
-# Config file and device description for  machine-independent
+# Config file and device description for machine-independent
 # code for devices for Digital Equipment Corp. systems.
 # Included by ports that need it.
 
@@ -9,5 +9,5 @@
 # which need it should specify the le_de_subr attribute.
 define	le_dec_subr
 
-#  DMA copy functions.  Lance attachments qhich Decices
+# DMA copy functions.
 file	dev/dec/if_le_dec.c		le_dec_subr
diff --git a/sys/dev/gpio/files.gpio b/sys/dev/gpio/files.gpio
index 8f79dfd9170..e462d526ed1 100644
--- a/sys/dev/gpio/files.gpio
+++ b/sys/dev/gpio/files.gpio
@@ -1,6 +1,6 @@
-# $OpenBSD: files.gpio,v 1.1 2004/06/03 18:08:00 grange Exp $
+# $OpenBSD: files.gpio,v 1.2 2005/03/08 20:00:24 tdeval Exp $
 
-define	gpio { pin, mask }
+define	gpio {pin, mask}
 
 device	gpio: gpio
 attach	gpio at gpiobus
diff --git a/sys/dev/i2c/files.i2c b/sys/dev/i2c/files.i2c
index 546f8ccf8bf..efce61dbcf6 100644
--- a/sys/dev/i2c/files.i2c
+++ b/sys/dev/i2c/files.i2c
@@ -1,7 +1,7 @@
-# $OpenBSD: files.i2c,v 1.3 2004/05/24 12:46:44 grange Exp $
+# $OpenBSD: files.i2c,v 1.4 2005/03/08 20:00:24 tdeval Exp $
 #	$NetBSD: files.i2c,v 1.3 2003/10/20 16:24:10 briggs Exp $
 
-device	iic { addr, [size = -1] }
+device	iic {addr, [size = -1]}
 attach	iic at i2cbus
 file	dev/i2c/i2c.c				iic | i2cbus
 file	dev/i2c/i2c_exec.c			iic | i2cbus | i2cexec
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 068afe59ee0..e58c4afe6fd 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.88 2004/06/03 18:28:02 grange Exp $
+#	$OpenBSD: files.isa,v 1.89 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -20,8 +20,8 @@ file	dev/isa/isa.c			isa needs-flag
 # ISA DMA capability, if it exists on this ISA bus
 #
 define	isa_dma
-device  isadma
-attach  isadma at isa: isa_dma
+device	isadma
+attach	isadma at isa: isa_dma
 file	dev/isa/isadma.c		isadma needs-flag
 
 #
@@ -133,8 +133,8 @@ attach	mcd at isa
 file	dev/isa/mcd.c			mcd needs-flag
 
 # ISA "wd" (ESDI/IDE/etc.) controllers, ATAPI bus
-attach wdc at isa with wdc_isa: isa_dma
-file   dev/isa/wdc_isa.c                wdc_isa
+attach	wdc at isa with wdc_isa: isa_dma
+file	dev/isa/wdc_isa.c		wdc_isa
 
 # Wangtek- and Archive-compatible tape controller boards
 device	wt: tape, isa_dma
@@ -211,9 +211,9 @@ file	dev/isa/if_ie.c			ie_isa
 
 # Intel i82595-based boards.
 # (Intel EtherExpress PRO/100)
-device  iy: ether, ifnet
+device	iy: ether, ifnet
 attach	iy at isa
-file    dev/isa/if_iy.c			iy
+file	dev/isa/if_iy.c			iy
 
 # Intel EtherExpress PRO/10
 device	ex: ether, ifnet
@@ -262,7 +262,7 @@ attach	mpu at isa with mpu_isa
 file	dev/isa/mpu_isa.c		mpu & midi
 
 # the SoundBlaster DSP, or close likenesses; used by other drivers
-define	sbdsp { }
+define	sbdsp {}
 file	dev/isa/sbdsp.c			sbdsp
 
 # SoundBlaster family
@@ -313,7 +313,7 @@ attach	wss at isa with wss_isa
 file	dev/isa/wss_isa.c		wss & (wss_isa | wss_isapnp) needs-flag
 
 # ESS Technology ES1887/ES888/ES1888
-device	ess { } : audio, isa_dma, mulaw, auconv, midibus
+device	ess {} : audio, isa_dma, mulaw, auconv, midibus
 file	dev/isa/ess.c			ess needs-flag
 
 attach	opl at ess with opl_ess
@@ -361,14 +361,14 @@ attach	rtii at isa
 file	dev/isa/radiotrack2.c		rtii
 
 # PC PPI + TIMER 1 (speaker interface)
-device  pcppi {}
-attach  pcppi at isa
+device	pcppi {}
+attach	pcppi at isa
 file	dev/isa/pcppi.c	pcppi	needs-flag
 device	spkr
 attach	spkr at pcppi
-file	dev/isa/spkr.c		spkr	needs-flag
+file	dev/isa/spkr.c			spkr	needs-flag
 attach	midi at pcppi with midi_pcppi: midisyn
-file	dev/isa/midi_pcppi.c    midi_pcppi
+file	dev/isa/midi_pcppi.c		midi_pcppi
 
 # 8255A-based PC parallel ports
 attach	lpt at isa with lpt_isa
@@ -396,10 +396,10 @@ file	dev/isa/it.c			it
 #
 # PCMCIA PCIC (i82365SL and compatibles):
 #
-#device pcicmaster { [irq = -1], [iomem = -1], [iosiz = 0] }
-#attach pcicmaster at isa
-#device pcic: pcmciabus
-#attach pcic at pcicmaster
-#file dev/isa/pcmcia_pcic.c  pcic | pcicmaster
+#device	pcicmaster {[irq = -1], [iomem = -1], [iosiz = 0]}
+#attach	pcicmaster at isa
+#device	pcic: pcmciabus
+#attach	pcic at pcicmaster
+#file	dev/isa/pcmcia_pcic.c		pcic | pcicmaster
 
-#file dev/isa/pcmcia_isa.c  pcmcia
+#file	dev/isa/pcmcia_isa.c		pcmcia
diff --git a/sys/dev/isa/files.isapnp b/sys/dev/isa/files.isapnp
index 7c69361ad32..1f6cafb5e7a 100644
--- a/sys/dev/isa/files.isapnp
+++ b/sys/dev/isa/files.isapnp
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isapnp,v 1.27 2003/05/20 04:22:17 mickey Exp $
+#	$OpenBSD: files.isapnp,v 1.28 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.isapnp,v 1.7 1997/10/16 17:16:36 matt Exp $
 #
 # Config file and device description for machine-independent ISAPnP code.
@@ -64,7 +64,7 @@ attach	rt at isapnp with rt_isapnp
 file	dev/isa/rt_isapnp.c		rt_isapnp
 
 # Yamaha OPL3-SA3
-device  ym: audio, isa_dma, ad1848, auconv, midibus
+device	ym: audio, isa_dma, ad1848, auconv, midibus
 attach	ym at isapnp with ym_isapnp
 file	dev/isa/ym.c			ym_isapnp
 file	dev/isa/ym_isapnp.c		ym_isapnp
diff --git a/sys/dev/mii/files.mii b/sys/dev/mii/files.mii
index fbf34706110..d45d420f635 100644
--- a/sys/dev/mii/files.mii
+++ b/sys/dev/mii/files.mii
@@ -1,118 +1,118 @@
-#	$OpenBSD: files.mii,v 1.23 2004/12/01 00:24:38 pvalchev Exp $
+#	$OpenBSD: files.mii,v 1.24 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.mii,v 1.13 1998/11/05 00:36:48 thorpej Exp $
 
-file    dev/mii/mii.c				mii
+file	dev/mii/mii.c				mii
 
-define mii_phy
-file dev/mii/mii_physubr.c			mii_phy
+define	mii_phy
+file	dev/mii/mii_physubr.c			mii_phy
 
-define ukphy_subr
-file dev/mii/ukphy_subr.c			ukphy_subr
+define	ukphy_subr
+file	dev/mii/ukphy_subr.c			ukphy_subr
 
-device tlphy: mii_phy
-attach tlphy at mii
-file dev/mii/tlphy.c				tlphy
+device	tlphy: mii_phy
+attach	tlphy at mii
+file	dev/mii/tlphy.c				tlphy
 
-device txphy: mii_phy, ukphy_subr
-attach txphy at mii
-file dev/mii/txphy.c				txphy
+device	txphy: mii_phy, ukphy_subr
+attach	txphy at mii
+file	dev/mii/txphy.c				txphy
 
-device nsphy: mii_phy
-attach nsphy at mii
-file dev/mii/nsphy.c				nsphy
+device	nsphy: mii_phy
+attach	nsphy at mii
+file	dev/mii/nsphy.c				nsphy
 
-device nsphyter: mii_phy
-attach nsphyter at mii
-file dev/mii/nsphyter.c				nsphyter
+device	nsphyter: mii_phy
+attach	nsphyter at mii
+file	dev/mii/nsphyter.c			nsphyter
 
-device gentbi: mii_phy
-attach gentbi at mii
-file dev/mii/gentbi.c				gentbi
+device	gentbi: mii_phy
+attach	gentbi at mii
+file	dev/mii/gentbi.c			gentbi
 
-device qsphy: mii_phy
-attach qsphy at mii
-file dev/mii/qsphy.c				qsphy
+device	qsphy: mii_phy
+attach	qsphy at mii
+file	dev/mii/qsphy.c				qsphy
 
-device inphy: mii_phy
-attach inphy at mii
-file dev/mii/inphy.c				inphy
+device	inphy: mii_phy
+attach	inphy at mii
+file	dev/mii/inphy.c				inphy
 
-device iophy: mii_phy
-attach iophy at mii
-file dev/mii/iophy.c				iophy
+device	iophy: mii_phy
+attach	iophy at mii
+file	dev/mii/iophy.c				iophy
 
-device eephy: mii_phy, ukphy_subr
-attach eephy at mii
-file dev/mii/eephy.c				eephy
+device	eephy: mii_phy, ukphy_subr
+attach	eephy at mii
+file	dev/mii/eephy.c				eephy
 
-device exphy: mii_phy, ukphy_subr
-attach exphy at mii
-file dev/mii/exphy.c				exphy
+device	exphy: mii_phy, ukphy_subr
+attach	exphy at mii
+file	dev/mii/exphy.c				exphy
 
-device rlphy: mii_phy, ukphy_subr
-attach rlphy at mii
-file dev/mii/rlphy.c				rlphy
+device	rlphy: mii_phy, ukphy_subr
+attach	rlphy at mii
+file	dev/mii/rlphy.c				rlphy
 
-device lxtphy: mii_phy, ukphy_subr
-attach lxtphy at mii
-file dev/mii/lxtphy.c				lxtphy
+device	lxtphy: mii_phy, ukphy_subr
+attach	lxtphy at mii
+file	dev/mii/lxtphy.c			lxtphy
 
-device mtdphy: mii_phy, ukphy_subr
-attach mtdphy at mii
-file dev/mii/mtdphy.c				mtdphy
+device	mtdphy: mii_phy, ukphy_subr
+attach	mtdphy at mii
+file	dev/mii/mtdphy.c			mtdphy
 
-device icsphy: mii_phy
-attach icsphy at mii
-file dev/mii/icsphy.c				icsphy
+device	icsphy: mii_phy
+attach	icsphy at mii
+file	dev/mii/icsphy.c			icsphy
 
-device sqphy: mii_phy
-attach sqphy at mii
-file dev/mii/sqphy.c				sqphy
+device	sqphy: mii_phy
+attach	sqphy at mii
+file	dev/mii/sqphy.c				sqphy
 
-device tqphy: mii_phy
-attach tqphy at mii
-file dev/mii/tqphy.c				tqphy
+device	tqphy: mii_phy
+attach	tqphy at mii
+file	dev/mii/tqphy.c				tqphy
 
-device ukphy: mii_phy, ukphy_subr
-attach ukphy at mii
-file dev/mii/ukphy.c				ukphy
+device	ukphy: mii_phy, ukphy_subr
+attach	ukphy at mii
+file	dev/mii/ukphy.c				ukphy
 
-device dcphy: mii_phy
-attach dcphy at mii
-file dev/mii/dcphy.c				dcphy
+device	dcphy: mii_phy
+attach	dcphy at mii
+file	dev/mii/dcphy.c				dcphy
 
-device bmtphy: mii_phy
-attach bmtphy at mii
-file dev/mii/bmtphy.c				bmtphy
+device	bmtphy: mii_phy
+attach	bmtphy at mii
+file	dev/mii/bmtphy.c			bmtphy
 
-device brgphy: mii_phy
-attach brgphy at mii
-file dev/mii/brgphy.c				brgphy
+device	brgphy: mii_phy
+attach	brgphy at mii
+file	dev/mii/brgphy.c			brgphy
 
-device xmphy: mii_phy
-attach xmphy at mii
-file dev/mii/xmphy.c				xmphy
+device	xmphy: mii_phy
+attach	xmphy at mii
+file	dev/mii/xmphy.c				xmphy
 
-device amphy: mii_phy
-attach amphy at mii
-file dev/mii/amphy.c				amphy
+device	amphy: mii_phy
+attach	amphy at mii
+file	dev/mii/amphy.c				amphy
 
-device acphy: mii_phy
-attach acphy at mii
-file dev/mii/acphy.c				acphy
+device	acphy: mii_phy
+attach	acphy at mii
+file	dev/mii/acphy.c				acphy
 
-device nsgphy: mii_phy
-attach nsgphy at mii
-file dev/mii/nsgphy.c				nsgphy
+device	nsgphy: mii_phy
+attach	nsgphy at mii
+file	dev/mii/nsgphy.c			nsgphy
 
-device urlphy: mii_phy
-attach urlphy at mii
-file dev/mii/urlphy.c				urlphy
+device	urlphy: mii_phy
+attach	urlphy at mii
+file	dev/mii/urlphy.c			urlphy
 
-device rgephy: mii_phy
-attach rgephy at mii
-file dev/mii/rgephy.c				rgephy
+device	rgephy: mii_phy
+attach	rgephy at mii
+file	dev/mii/rgephy.c			rgephy
 
-device ciphy: mii_phy
-attach ciphy at mii
-file dev/mii/ciphy.c				ciphy
+device	ciphy: mii_phy
+attach	ciphy at mii
+file	dev/mii/ciphy.c				ciphy
diff --git a/sys/dev/ofw/files.ofw b/sys/dev/ofw/files.ofw
index 8eebf043651..d7b0a92474f 100644
--- a/sys/dev/ofw/files.ofw
+++ b/sys/dev/ofw/files.ofw
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.ofw,v 1.3 1998/08/22 18:00:32 rahnds Exp $
+#	$OpenBSD: files.ofw,v 1.4 2005/03/08 20:00:25 tdeval Exp $
 
 #
 # First cut on Openfirmware interface
@@ -12,7 +12,7 @@ attach	ofdisk at openfirm
 file	dev/ofw/ofdisk.c		ofdisk needs-flag
 
 # Generic net support
-#define	ipkdbofn { [ disable = 0 ] }
+#define	ipkdbofn {[disable = 0]}
 #device	ofnet: ether, ifnet, ipkdbofn
 device	ofnet: ether, ifnet
 #device	ipkdbif: ether, ifnet 
@@ -26,7 +26,7 @@ attach	ofcons at openfirm
 file	dev/ofw/ofcons.c		ofcons needs-flag
 
 # Generic RTC support
-device ofrtc
+device	ofrtc
 attach	ofrtc at openfirm
 file	dev/ofw/ofrtc.c			ofrtc needs-flag
 
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 96ca9c4f7ae..41752444325 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.172 2005/03/05 23:58:44 tdeval Exp $
+#	$OpenBSD: files.pci,v 1.173 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config file and device description for machine-independent PCI code.
@@ -87,7 +87,7 @@ attach	eap at pci
 file	dev/pci/eap.c			eap
 
 # ESS Solo-1 PCI AudioDrive
-device	eso { }: audio, auconv, mulaw, midibus
+device	eso {}: audio, auconv, mulaw, midibus
 attach	eso at pci
 file	dev/pci/eso.c			eso
 
@@ -127,10 +127,10 @@ file	dev/pci/maestro.c		maestro
 # ESS Maestro3
 device	esa: audio, auconv, mulaw, ac97
 attach	esa at pci
-file	dev/pci/esa.c		esa
+file	dev/pci/esa.c			esa
 
 # Yamaha YMF Audio
-device	yds { }: audio, auconv, mulaw, ac97, firmload
+device	yds {}: audio, auconv, mulaw, ac97, firmload
 attach	yds at pci
 file	dev/pci/yds.c			yds
 
@@ -204,7 +204,7 @@ attach	ncr at pci
 file	dev/pci/ncr.c			ncr
 
 # common code for siop/esiop pci front end
-define siop_pci_common
+define	siop_pci_common
 file	dev/pci/siop_pci_common.c	siop_pci_common
 
 # Symbios 53c8xx SCSI chips
@@ -425,9 +425,9 @@ attach	an at pci with an_pci
 file	dev/pci/if_an_pci.c		an_pci
 
 # Intel PRO/Wireless 2100
-device  ipw: ifnet, wlan, firmload
-attach  ipw at pci
-file    dev/pci/if_ipw.c                ipw
+device	ipw: ifnet, wlan, firmload
+attach	ipw at pci
+file	dev/pci/if_ipw.c		ipw
 
 # Intel PRO/Wireless 2200BG/2915ABG
 device	iwi: ifnet, wlan, firmload
@@ -521,11 +521,11 @@ file	dev/pci/if_ral_pci.c		ral_pci
 # Sangoma PCI card
 device	san: ifnet, ifmedia
 attach	san at pci
-file dev/pci/if_sandrv.c 	san
-file dev/pci/if_san_common.c 	san
-file dev/pci/if_san_obsd.c 	san
-file dev/pci/if_san_te1.c 	san
-file dev/pci/if_san_xilinx.c 	san
+file	dev/pci/if_sandrv.c 		san
+file	dev/pci/if_san_common.c 	san
+file	dev/pci/if_san_obsd.c 		san
+file	dev/pci/if_san_te1.c 		san
+file	dev/pci/if_san_xilinx.c 	san
 
 # PIIX4 power management controller
 device	piixpm {}
diff --git a/sys/dev/pckbc/files.pckbc b/sys/dev/pckbc/files.pckbc
index 0728e721278..5dc437b2673 100644
--- a/sys/dev/pckbc/files.pckbc
+++ b/sys/dev/pckbc/files.pckbc
@@ -1,16 +1,16 @@
-# $OpenBSD: files.pckbc,v 1.3 2003/02/17 23:07:43 miod Exp $
+# $OpenBSD: files.pckbc,v 1.4 2005/03/08 20:00:25 tdeval Exp $
 # $NetBSD: files.pckbc,v 1.6 1999/01/23 16:05:56 drochner Exp $
 # devices attached at pckbc, for use with wscons
 
 device	pckbd: wskbddev
 attach	pckbd at pckbc
-file	dev/pckbc/pckbd.c		pckbd	needs-flag
+file	dev/pckbc/pckbd.c			pckbd	needs-flag
 file	dev/pckbc/wskbdmap_mfii.c		pckbd
 
-device  pms: wsmousedev
-attach  pms at pckbc, gsckbc
-file    dev/pckbc/psm.c            pms
+device	pms: wsmousedev
+attach	pms at pckbc, gsckbc
+file	dev/pckbc/psm.c				pms
 
-device  pmsi: wsmousedev
-attach  pmsi at pckbc
-file    dev/pckbc/psm_intelli.c            pmsi
+device	pmsi: wsmousedev
+attach	pmsi at pckbc
+file	dev/pckbc/psm_intelli.c			pmsi
diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia
index f6d3922d319..c2258786138 100644
--- a/sys/dev/pcmcia/files.pcmcia
+++ b/sys/dev/pcmcia/files.pcmcia
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pcmcia,v 1.37 2002/06/15 05:55:59 fgsch Exp $
+#	$OpenBSD: files.pcmcia,v 1.38 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.pcmcia,v 1.9 1998/06/21 18:45:41 christos Exp $
 #
 # Config.new file and device description for machine-independent PCMCIA code.
@@ -10,7 +10,7 @@ file	dev/pcmcia/pcmcia_cis.c			pcmcia
 file	dev/pcmcia/pcmcia_cis_quirks.c		pcmcia
 
 # device declaration in sys/conf/files
-attach pcmcia at pcmciabus
+attach	pcmcia at pcmciabus
 
 # 3Com 3c589 Ethernet, 3c562 multifunction Ethernet, and 3CXEM556
 # multifunction Ethernet controllers
@@ -46,17 +46,17 @@ file	dev/pcmcia/if_sm_pcmcia.c		sm_pcmcia
 #file	dev/pcmcia/if_mbe_pcmcia.c		mbe_pcmcia
 
 # Xircom Ethernet controllers
-device xe: ether, ifnet, mii, ifmedia
-attach xe at pcmcia with xe_pcmcia
-file dev/pcmcia/if_xe.c				xe_pcmcia
+device	xe: ether, ifnet, mii, ifmedia
+attach	xe at pcmcia with xe_pcmcia
+file	dev/pcmcia/if_xe.c			xe_pcmcia
 
 # PCMCIA Floppy controller
 #attach	fdc at pcmcia with fdc_pcmcia
 #file	dev/pcmcia/fdc_pcmcia.c			fdc_pcmcia
 
 # Proxim RangeLAN2 PC-Card
-attach rln at pcmcia with rln_pcmcia
-file dev/pcmcia/if_rln_pcmcia.c			rln_pcmcia
+attach	rln at pcmcia with rln_pcmcia
+file	dev/pcmcia/if_rln_pcmcia.c		rln_pcmcia
 
 # PCMCIA multi-port serial cards
 #device	pcmcom {[slave = -1]}
@@ -74,13 +74,13 @@ attach	wi at pcmcia with wi_pcmcia
 file	dev/pcmcia/if_wi_pcmcia.c		wi_pcmcia
 
 # AMD 79c930-based 802.11 cards (including BayStack 650 FH card).
-device awi: ether, ifnet
-attach awi at pcmcia with awi_pcmcia
-file    dev/pcmcia/if_awi_pcmcia.c		awi_pcmcia
-file    dev/ic/awi.c				awi
-file    dev/ic/awi_wep.c			awi
-#file    dev/ic/awi_wicfg.c			awi
-file    dev/ic/am79c930.c			awi
+device	awi: ether, ifnet
+attach	awi at pcmcia with awi_pcmcia
+file	dev/pcmcia/if_awi_pcmcia.c		awi_pcmcia
+file	dev/ic/awi.c				awi
+file	dev/ic/awi_wep.c			awi
+#file	dev/ic/awi_wicfg.c			awi
+file	dev/ic/am79c930.c			awi
 
 # Raytheon(Raylink)/WebGear IEEE 802.11 FH WLAN
 device	ray: ether, ifnet, ifmedia
diff --git a/sys/dev/rasops/files.rasops b/sys/dev/rasops/files.rasops
index 0114775d8de..977ce1b72be 100644
--- a/sys/dev/rasops/files.rasops
+++ b/sys/dev/rasops/files.rasops
@@ -1,17 +1,17 @@
-#	$OpenBSD: files.rasops,v 1.3 2003/04/14 10:42:26 miod Exp $
+#	$OpenBSD: files.rasops,v 1.4 2005/03/08 20:00:25 tdeval Exp $
 # 	$NetBSD: files.rasops,v 1.7 2001/01/21 13:50:59 takemura Exp $
 
 # Note: `rasops_glue' is only here to force the header file's name
-#       hence it must be mentioned first  (shudder...)
-file dev/rasops/rasops.c	((rasops_glue | rasops1 | rasops2 | rasops4 |
+#	hence it must be mentioned first (shudder...)
+file	dev/rasops/rasops.c	((rasops_glue | rasops1 | rasops2 | rasops4 |
 				rasops8 | rasops15 | rasops16 | rasops24 |
 				rasops32) & wsdisplay)	needs-flag
 
-file dev/rasops/rasops_masks.c	wsdisplay & (rasops1 | rasops2 | rasops4)
-file dev/rasops/rasops1.c	wsdisplay & rasops1
-file dev/rasops/rasops2.c	wsdisplay & rasops2
-file dev/rasops/rasops4.c	wsdisplay & rasops4
-file dev/rasops/rasops8.c	wsdisplay & rasops8
-file dev/rasops/rasops15.c	wsdisplay & (rasops15 | rasops16)
-file dev/rasops/rasops24.c	wsdisplay & rasops24
-file dev/rasops/rasops32.c	wsdisplay & rasops32
+file	dev/rasops/rasops_masks.c  wsdisplay & (rasops1 | rasops2 | rasops4)
+file	dev/rasops/rasops1.c	wsdisplay & rasops1
+file	dev/rasops/rasops2.c	wsdisplay & rasops2
+file	dev/rasops/rasops4.c	wsdisplay & rasops4
+file	dev/rasops/rasops8.c	wsdisplay & rasops8
+file	dev/rasops/rasops15.c	wsdisplay & (rasops15 | rasops16)
+file	dev/rasops/rasops24.c	wsdisplay & rasops24
+file	dev/rasops/rasops32.c	wsdisplay & rasops32
diff --git a/sys/dev/sbus/files.sbus b/sys/dev/sbus/files.sbus
index 5f619a00e57..1308f48a972 100644
--- a/sys/dev/sbus/files.sbus
+++ b/sys/dev/sbus/files.sbus
@@ -1,11 +1,11 @@
-#	$OpenBSD: files.sbus,v 1.30 2005/03/05 01:49:03 miod Exp $
+#	$OpenBSD: files.sbus,v 1.31 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.sbus,v 1.16 2000/12/08 17:29:12 martin Exp $
 #
 # Config file and device description for machine-independent SBUS code.
 # Included by ports that need it.
 
-device	sbus { [slot = -1], [offset = -1] }
-#notyet:file	dev/sbus/sbus.c			sbus
+device	sbus {[slot = -1], [offset = -1]}
+#notyet:file	dev/sbus/sbus.c		sbus
 
 # Sbus NCR539x SCSI & Lance Ethernet
 device	dma {}: lsi64854
diff --git a/sys/dev/tc/files.tc b/sys/dev/tc/files.tc
index 387eeb05a03..e8b563b6972 100644
--- a/sys/dev/tc/files.tc
+++ b/sys/dev/tc/files.tc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.tc,v 1.7 2004/09/16 09:14:02 mickey Exp $
+#	$OpenBSD: files.tc,v 1.8 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.tc,v 1.26 2001/11/28 10:21:24 lukem Exp $
 #
 # Config file and device description for machine-independent
@@ -17,10 +17,10 @@ file	dev/tc/ioasic_subr.c		ioasic
 #  lance device defined in sys/conf/files
 #  le_dec_subr	attribute defined in sys/dev/dec/files.dec
 
-attach le at ioasic with le_ioasic:	le_dec_subr
+attach	le at ioasic with le_ioasic:	le_dec_subr
 file	dev/tc/if_le_ioasic.c		le_ioasic
 
-attach le at tc with le_tc:		le_dec_subr
+attach	le at tc with le_tc:		le_dec_subr
 file	dev/tc/if_le_tc.c		le_tc
 
 # DEFTA FDDI controller
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index eda54bd8be2..98805a774bf 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,11 +1,11 @@
-#	$OpenBSD: files.usb,v 1.43 2005/01/14 12:21:02 grange Exp $
+#	$OpenBSD: files.usb,v 1.44 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
 #
 # Config file and device description for machine-independent USB code.
 # Included by ports that need it.  Ports that use it must provide
 # their own "major" declarations for the appropriate devices.
 
-device	usb { }
+device	usb {}
 attach	usb at usbus
 file	dev/usb/usb.c			usb			needs-flag
 file	dev/usb/usbdi.c			usb
@@ -15,15 +15,15 @@ file	dev/usb/usb_subr.c		usb
 file	dev/usb/usb_quirks.c		usb
 
 # Hub driver
-device	uhub { [port = -1], [configuration = -1], [interface = -1],
-               [vendor = -1], [product = -1], [release = -1] }
+device	uhub {[port = -1], [configuration = -1], [interface = -1],
+	      [vendor = -1], [product = -1], [release = -1]}
 attach	uhub at usb
 file	dev/usb/uhub.c			usb
 
 attach	uhub at uhub with uhub_uhub
 
 # Modem and com serial port "bus"
-define	ucombus {[ portno = -1 ]}
+define	ucombus {[portno = -1]}
 
 # EZ-USB firmware loader
 define	ezload
@@ -54,7 +54,7 @@ file	dev/usb/ugen.c			ugen			needs-flag
 
 # HID
 # HID "bus"
-define	uhidbus {[ reportid = -1 ]}
+define	uhidbus {[reportid = -1]}
 
 # HID processing
 define	hid
@@ -205,13 +205,13 @@ attach	usscanner at uhub
 file	dev/usb/usscanner.c		usscanner
 
 # Prism3 WI @ USB
-attach  wi at uhub with wi_usb
-file    dev/usb/if_wi_usb.c 		wi_usb
+attach	wi at uhub with wi_usb
+file	dev/usb/if_wi_usb.c 		wi_usb
 
 # Atmel AT76c503 / AT76c503a / AT76c505 / AT76c505a @ USB
 device	atu: ether, ifnet, ifmedia, wlan, firmload
 attach	atu at uhub
-file    dev/usb/if_atu.c 		atu
+file	dev/usb/if_atu.c 		atu
 
 # Bluetooth
 device	ubt: ifnet, bluetooth
diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons
index 3c98757d313..f8fd1d21220 100644
--- a/sys/dev/wscons/files.wscons
+++ b/sys/dev/wscons/files.wscons
@@ -1,4 +1,4 @@
-# $OpenBSD: files.wscons,v 1.7 2004/03/10 00:31:40 deraadt Exp $
+# $OpenBSD: files.wscons,v 1.8 2005/03/08 20:00:25 tdeval Exp $
 # $NetBSD: files.wscons,v 1.19 1999/12/12 08:17:28 scottr Exp $
 
 #
@@ -39,7 +39,7 @@ file	dev/rcons/raster_op.c			wsrasteremulops
 file	dev/rcons/raster_text.c			wsrasteremulops
 file	dev/wscons/wscons_rinit.c		wsrasteremulops
 file	dev/wscons/wscons_rops.c		wsrasteremulops
-file    dev/wscons/wscons_gallant19.c		wsrasteremulops
+file	dev/wscons/wscons_gallant19.c		wsrasteremulops
 file	dev/wscons/wscons_font8x16.c		wsrasteremulops
 
 pseudo-device	wsmux
diff --git a/sys/scsi/files.scsi b/sys/scsi/files.scsi
index 6f14a648577..2b389411d3c 100644
--- a/sys/scsi/files.scsi
+++ b/sys/scsi/files.scsi
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.scsi,v 1.12 2004/09/15 23:49:11 mickey Exp $
+#	$OpenBSD: files.scsi,v 1.13 2005/03/08 20:00:25 tdeval Exp $
 #	$NetBSD: files.scsi,v 1.4 1996/05/16 04:01:08 mycroft Exp $
 #
 # Config.new file and device description for machine-independent SCSI code.
@@ -8,7 +8,7 @@
 file	scsi/scsi_base.c		scsi
 file	scsi/scsi_ioctl.c		scsi
 file	scsi/scsiconf.c			scsi
-file    scsi/atapi_base.c               scsi
+file	scsi/atapi_base.c		scsi
 
 device	scsibus {[target = -1], [lun = -1]}
 attach	scsibus at scsi
@@ -16,8 +16,8 @@ attach	scsibus at scsi
 device	cd: disk
 attach	cd at scsibus
 file	scsi/cd.c			cd needs-flag
-file    scsi/cd_scsi.c                  cd
-file    scsi/cd_atapi.c                 cd
+file	scsi/cd_scsi.c			cd
+file	scsi/cd_atapi.c			cd
 
 device	ch: disk
 attach	ch at scsibus