Cosmetics...

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

17 files changed, 194 insertions, 194 deletions

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