spacing; ok miod@ deraadt@

35 files changed, 158 insertions, 158 deletions

diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index a1edc817056..599b2e5437c 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.63 2005/01/06 21:32:56 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.64 2005/05/01 07:54:41 david Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -143,7 +143,7 @@ sd*	at scsibus?			# SCSI disk drives
 # Workstation Console attachments
 wsdisplay*	at vga?
 wsdisplay*	at tga?
-wskbd*          at pckbd? mux 1
+wskbd*		at pckbd? mux 1
 
 #pseudo-device	bpfilter	1
 pseudo-device	loop
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index d5c2025388a..eb30ef6214a 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.26 2005/01/06 21:32:56 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.27 2005/05/01 07:54:41 david Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -145,7 +145,7 @@ sd*	at scsibus?			# SCSI disk drives
 # Workstation Console attachments
 wsdisplay*	at vga?
 wsdisplay*	at tga?
-wskbd*          at pckbd? mux 1
+wskbd*		at pckbd? mux 1
 
 #pseudo-device	bpfilter	1
 pseudo-device	loop
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 852fad3915b..452c985183f 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKBIG,v 1.51 2005/02/25 12:57:49 jsg Exp $
+#	$OpenBSD: RAMDISKBIG,v 1.52 2005/05/01 07:54:41 david Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -262,7 +262,7 @@ ep*	at isapnp?
 lc0	at isa? port 0x200		# DEC EtherWorks
 lc1	at isa? port 0x280		# DEC EtherWorks
 
-cy0     at isa? iomem 0xd4000 irq 12	# ISA cyclom card
+cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom card
 
 #aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
 #scsibus* at aic?
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index ebafba39564..29b50f76550 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.62 2005/04/30 00:49:35 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.63 2005/05/01 07:54:42 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -265,7 +265,7 @@ rl*	at pci?				# RealTek 81[23]9 ethernet
 #tl*	at pci?				# Compaq Thunderlan ethernet
 vr*	at pci?				# VIA Rhine ethernet
 #wb*	at pci?				# Winbond W89C840F ethernet
-sf*	at pci? 			# Adaptec AIC-6915 ethernet
+sf*	at pci?				# Adaptec AIC-6915 ethernet
 sis*	at pci?				# SiS 900/7016 ethernet
 ste*	at pci?				# Sundance ST201 ethernet
 dc*	at pci?				# 21143, "tulip" clone ethernet
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 9c02e0a3270..ea23fdcb995 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.22 2005/04/30 00:49:35 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.23 2005/05/01 07:54:42 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -16,11 +16,11 @@ maxusers	32			# estimated number of users
 options		ARM32
 options		FOOTBRIDGE_INTR
 
-#options 	UCONSOLE	# users can use TIOCCONS (for xconsole)
-#options 	INSECURE	# disable kernel securelevel
+#options	UCONSOLE	# users can use TIOCCONS (for xconsole)
+#options	INSECURE	# disable kernel securelevel
 
-#options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
-#options 	NTP		# NTP phase/frequency locked loop
+#options	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
+#options	NTP		# NTP phase/frequency locked loop
 
 option		APERTURE	# in-kernel aperture driver for XFree86
 option		USER_PCICONF	# user-space PCI configuration
@@ -28,11 +28,11 @@ option		USER_PCICONF	# user-space PCI configuration
 # CPU options
 
 # For StrongARM systems
-options 	CPU_SA110	# Support the SA110 core
+options		CPU_SA110	# Support the SA110 core
 
 # FPA options
 
-#options 	ARMFPE		# ARM Ltd FPE
+#options	ARMFPE		# ARM Ltd FPE
 
 option WSDISPLAY_COMPAT_USL		# VT handling
 option WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
@@ -53,8 +53,8 @@ todclock0	at todservice?	# time-of-day device
 pci0		at footbridge?	# PCI bus
 pci*		at ppb?
 
-option          PCIVERBOSE
-option          USBVERBOSE
+option		PCIVERBOSE
+option		USBVERBOSE
 
 # PCI bridges
 ppb*	at pci?			# PCI-PCI bridges
diff --git a/sys/arch/cats/conf/RAMDISK b/sys/arch/cats/conf/RAMDISK
index 94e8334f04d..0e2ed80f4a5 100644
--- a/sys/arch/cats/conf/RAMDISK
+++ b/sys/arch/cats/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.12 2005/01/13 16:16:45 drahn Exp $
+#	$OpenBSD: RAMDISK,v 1.13 2005/05/01 07:54:42 david Exp $
 
 machine	cats	arm
 
@@ -13,7 +13,7 @@ option		INET		# IP + ICMP + TCP + UDP
 option		INET6		# IPv6 (needs INET)
 option		DDB		# kernel debugger
 option		EXT2FS		# Second Extended Filesystem
-option          FIFO            # FIFOs; RECOMMENDED
+option		FIFO		# FIFOs; RECOMMENDED
 
 options	ARM32
 options FOOTBRIDGE_INTR
@@ -25,13 +25,13 @@ maxusers	32
 # CPU options
 
 # For StrongARM systems
-options 	CPU_SA110	# Support the SA110 core
+options		CPU_SA110	# Support the SA110 core
 
 # FPA options
 
-#options 	ARMFPE		# ARM Ltd FPE
+#options	ARMFPE		# ARM Ltd FPE
 
-config                bsd     root on rd0a swap on rd0b
+config		bsd	root on rd0a swap on rd0b
 
 # The main bus device
 mainbus0 at root
@@ -54,8 +54,8 @@ pci0	at footbridge?		# PCI bus
 
 pci*	at ppb?
 
-option          PCIVERBOSE
-option          USBVERBOSE
+option		PCIVERBOSE
+option		USBVERBOSE
 
 # PCI bridges
 ppb*	at pci?			# PCI-PCI bridges
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index c5d76a3ff37..152ec997d81 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.40 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.41 2005/05/01 07:54:42 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -64,7 +64,7 @@ hilid*		at hil?		# ID module
 frodo0		at intio?
 
 # 8250-like serial ports found on Frodo ASIC
-dnkbd0		at frodo? 	# Domain keyboard flavor
+dnkbd0		at frodo?	# Domain keyboard flavor
 wskbd*		at dnkbd? mux 1
 wsmouse*	at dnkbd? mux 0
 apci*		at frodo?	# tty flavor
diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK
index d1d1cb48727..4a200dfe3f7 100644
--- a/sys/arch/hp300/conf/RAMDISK
+++ b/sys/arch/hp300/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.24 2005/04/22 11:59:11 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.25 2005/05/01 07:54:42 david Exp $
 #
 # Ram disk kernel.
 #
@@ -74,7 +74,7 @@ wskbd*		at hilkbd? mux 1
 frodo0		at intio?
 
 # 8250-like serial ports found on Frodo ASIC
-dnkbd0		at frodo? 	# Domain keyboard flavor
+dnkbd0		at frodo?	# Domain keyboard flavor
 wskbd*		at dnkbd? mux 1
 #wsmouse*	at dnkbd? mux 0
 apci*		at frodo?	# tty flavor
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC
index 74dc205b378..5d9b093981e 100644
--- a/sys/arch/hppa64/conf/GENERIC
+++ b/sys/arch/hppa64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.3 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.4 2005/05/01 07:54:42 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -49,7 +49,7 @@ pci*	at ppb?
 #option		CARDBUS_DEBUG,CARDSLOT_DEBUG,CARDBUS_MAP_DEBUG
 #cardbus*	at cardslot?
 #option		PCMCIADEBUG,PCMCIAVERBOSE
-#pcmcia* 	at cardslot?
+#pcmcia*	at cardslot?
 
 # PCI USB Controllers
 #ehci*	at pci?			# Enhanced Host Controller
@@ -128,7 +128,7 @@ pci*	at ppb?
 dc*	at pci?			# 21143, "tulip" clone ethernet
 #dc*	at cardbus?
 #rl*	at pci?			# RealTek 81[23]9 ethernet
-#rl* 	at cardbus?
+#rl*	at cardbus?
 #ep*	at pci?			# 3c59x
 #ep*	at cardbus?
 #xl*	at pci?			# 3C9xx ethernet
@@ -147,17 +147,17 @@ dcphy*		at mii?		# Digital Clone PHYs
 #exphy*		at mii?		# 3Com internal PHYs
 #inphy*		at mii?		# Intel 82555 PHYs
 #iophy*		at mii?		# Intel 82553 PHYs
-#icsphy* 	at mii?		# ICS1890 PHYs
+#icsphy*	at mii?		# ICS1890 PHYs
 lxtphy*		at mii?		# Level One LXT-970 PHYs
 nsphy*		at mii?		# NS83840 PHYs
 #nsphyter*	at mii?		# NS83843 PHYs
-#mtdphy* 	at mii?		# Myson MTD972 PHYs
+#mtdphy*	at mii?		# Myson MTD972 PHYs
 #qsphy*		at mii?		# Quality Semi QS6612 PHYs
 #sqphy*		at mii?		# Seeq 8022[013] PHYs
 #tlphy*		at mii?		# ThunderLAN PHYs
 #tqphy*		at mii?		# TDK Semiconductor PHYs
-#brgphy* 	at mii?		# Broadcom 10/100/1000 PHYs
-#bmtphy* 	at mii?		# Broadcom 10/100 PHYs
+#brgphy*	at mii?		# Broadcom 10/100/1000 PHYs
+#bmtphy*	at mii?		# Broadcom 10/100 PHYs
 #eephy*		at mii?		# Marvell 88E1000 Gigabit PHYs
 ukphy*		at mii?		# generic unknown PHYs
 
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 95bca1bd31d..1d7ad669856 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.409 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.410 2005/05/01 07:54:42 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -289,7 +289,7 @@ isp*	at pci?			# Qlogic ISP [12]0x0 SCSI/FibreChannel
 scsibus* at isp?
 aic0	at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
 aic*	at pcmcia?		# PCMCIA based aic SCSI controllers
-aic*	at isapnp? 		# isapnp configured aic SCSI controllers
+aic*	at isapnp?		# isapnp configured aic SCSI controllers
 scsibus* at aic?
 #esp*	at pcmcia?		# PCMCIA based NCR 53C9X SCSI
 #scsibus* at esp?
@@ -358,7 +358,7 @@ ne1	at isa? port 0x300 irq 10		# NE[12]000 ethernet
 ne2	at isa? port 0x280 irq 9		# NE[12]000 ethernet
 ne*	at isapnp?				# NE[12]000 PnP ethernet
 eg0	at isa? disable port 0x310 irq 5	# 3C505/Etherlink+ ethernet
-el0	at isa? disable port 0x300 irq 9 	# 3C501 ethernet
+el0	at isa? disable port 0x300 irq 9	# 3C501 ethernet
 ep0	at isa?					# 3C509 ethernet
 ep*	at isapnp?				# 3C509 PnP ethernet
 ep*	at isa?					# 3C509 ethernet
@@ -376,7 +376,7 @@ ep0	at eisa?
 ep*	at eisa?			# 3C579 ethernet
 fea*	at eisa?			# DEC DEFEA FDDI
 lmc*	at pci?				# Lan Media Corp SSI/T3/HSSI
-san* 	at pci?				# Sangoma PCI AFT card
+san*	at pci?				# Sangoma PCI AFT card
 le*	at pci?				# PCnet-PCI based ethernet
 le*	at isapnp?
 de*	at pci?				# DC21X4X-based ethernet
@@ -417,7 +417,7 @@ stge*	at pci?				# Sundance TC9021 GigE
 #lge*	at pci?				# Level1 LXT1001 GigE
 hme*	at pci?				# Sun Happy Meal
 bce*	at pci?				# Broadcom BCM4401
-vge*	at pci? 			# VIA VT612x
+vge*	at pci?				# VIA VT612x
 
 # Wireless network cards
 ath*	at pci?				# Atheros AR5k (802.11a/b/g)
@@ -463,7 +463,7 @@ xmphy*	at mii?				# XaQti XMAC-II PHYs
 nsgphy*	at mii?				# NS gigabit PHYs
 urlphy*	at mii?				# Realtek RTL8150L internal PHY
 rgephy*	at mii?				# Realtek 8169S/8110S PHY
-ciphy*  at mii?				# Cicada CS8201 10/100/1000 copper PHY
+ciphy*	at mii?				# Cicada CS8201 10/100/1000 copper PHY
 ukphy*	at mii?				# "unknown" PHYs
 
 pss0	at isa? port 0x220 irq 7 drq 6	# Personal Sound System
@@ -493,7 +493,7 @@ pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
 gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis (drq2 is record drq)
 ym*	at isapnp?
 mpu*	at isapnp?
-mpu*	at isa? port 0x300 		# generic MPU, Yamaha SW60XG
+mpu*	at isa? port 0x300		# generic MPU, Yamaha SW60XG
 #aria0	at isa? port 0x280 irq 10 drq 0 flags 0x1 # Prometheus Aria 16
 
 # OPL[23] FM synthesizers
diff --git a/sys/arch/i386/conf/GENERIC.MP b/sys/arch/i386/conf/GENERIC.MP
index f74b1962669..c22b58ca90a 100644
--- a/sys/arch/i386/conf/GENERIC.MP
+++ b/sys/arch/i386/conf/GENERIC.MP
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC.MP,v 1.4 2004/09/22 08:48:56 grange Exp $
+#	$OpenBSD: GENERIC.MP,v 1.5 2005/05/01 07:54:42 david Exp $
 #
 #	GENERIC.MP - sample multiprocessor kernel
 #
@@ -8,4 +8,4 @@ include "arch/i386/conf/GENERIC"
 option		MULTIPROCESSOR	# Multiple processor support
 
 cpu*		at mainbus?
-ioapic* 	at mainbus?
+ioapic*		at mainbus?
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 689b5fa2982..830e42aff08 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.55 2005/04/21 02:08:16 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.56 2005/05/01 07:54:42 david Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -282,7 +282,7 @@ re*	at cardbus?			# Realtek 8169/8169S/8110S
 #lge*	at pci?				# Level1 LXT1001 GigE
 #hme*	at pci?				# Sun Happy Meal
 #bce*	at pci?				# Broadcom BCM4401
-vge*	at pci? 			# VIA VT612x
+vge*	at pci?				# VIA VT612x
 
 # Wireless network cards
 ath*	at pci?				# Atheros AR5k (802.11a/b/g)
diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC
index e6a6b1975bd..0f4a5395452 100644
--- a/sys/arch/luna88k/conf/GENERIC
+++ b/sys/arch/luna88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.8 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.9 2005/05/01 07:54:42 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -28,28 +28,28 @@ config		bsd		swap generic
 # devices
 #
 
-mainbus0 at root
-clock0   at mainbus0
-le0      at mainbus0
-sio0     at mainbus0
-siotty0  at sio0
-ws0      at sio0
-fb0      at mainbus0
-spc0     at mainbus0
-spc1     at mainbus0
+mainbus0	at root
+clock0		at mainbus0
+le0		at mainbus0
+sio0		at mainbus0
+siotty0		at sio0
+ws0		at sio0
+fb0		at mainbus0
+spc0		at mainbus0
+spc1		at mainbus0
 
 # Workstation Console attachments
-wsdisplay* at fb?
-wskbd*     at ws?
-wsmouse*   at ws?
+wsdisplay*	at fb?
+wskbd*		at ws?
+wsmouse*	at ws?
 
 # SCSI bus support
-scsibus*   at spc?
+scsibus*	at spc?
 
 # SCSI devices
-sd* at scsibus?
-st* at scsibus?
-cd* at scsibus?
-ch* at scsibus?
-ss* at scsibus?
-uk* at scsibus?
+sd*		at scsibus?
+st*		at scsibus?
+cd*		at scsibus?
+ch*		at scsibus?
+ss*		at scsibus?
+uk*		at scsibus?
diff --git a/sys/arch/luna88k/conf/RAMDISK b/sys/arch/luna88k/conf/RAMDISK
index 7ea42f40073..c57fb9218b7 100644
--- a/sys/arch/luna88k/conf/RAMDISK
+++ b/sys/arch/luna88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.5 2004/09/16 09:35:36 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.6 2005/05/01 07:54:42 david Exp $
 
 machine		luna88k m88k
 
@@ -35,28 +35,28 @@ option		BOOT_CONFIG
 # devices
 #
 
-mainbus0 at root
-clock0   at mainbus0
-le0      at mainbus0
-sio0     at mainbus0
-siotty0  at sio0
-ws0      at sio0
-fb0      at mainbus0
-spc0     at mainbus0
-spc1     at mainbus0
+mainbus0	at root
+clock0		at mainbus0
+le0		at mainbus0
+sio0		at mainbus0
+siotty0		at sio0
+ws0		at sio0
+fb0		at mainbus0
+spc0		at mainbus0
+spc1		at mainbus0
 
 # Workstation Console attachments
-wsdisplay* at fb?
-wskbd*     at ws?
-wsmouse*   at ws?
+wsdisplay*	at fb?
+wskbd*		at ws?
+wsmouse*	at ws?
 
 # SCSI bus support
-scsibus*   at spc?
+scsibus*	at spc?
 
 # SCSI devices
-sd* at scsibus?			# SCSI disks
-st* at scsibus?			# SCSI tapes
-cd* at scsibus?			# SCSI CD-ROM
+sd*		at scsibus?			# SCSI disks
+st*		at scsibus?			# SCSI tapes
+cd*		at scsibus?			# SCSI CD-ROM
 
 pseudo-device	loop	1
 pseudo-device	bpfilter 1
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 925c837aad7..753cd2523e4 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.39 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.40 2005/05/01 07:54:42 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -22,7 +22,7 @@ option		FPSP
 option		FPU_EMULATE
 option		COMPAT_SUNOS	# SunOS m68k binary compatibility
 option		DISABLE_ADB_WITH_SERIAL_CONSOLE
-#option		MRG_ADB		  # Use ROM-based ADB driver
+#option		MRG_ADB		# Use ROM-based ADB driver
 
 config		bsd	swap generic
 
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
index 6179b88afea..9e6fdd81899 100644
--- a/sys/arch/mac68k/conf/RAMDISK
+++ b/sys/arch/mac68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.17 2004/12/08 20:21:31 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.18 2005/05/01 07:54:42 david Exp $
 #
 # RAMDISK - bsd.rd configuration file (non-SBC version)
 
@@ -34,7 +34,7 @@ option		M68020		# Must have 68851 PMMU
 option		FPSP
 option		FPU_EMULATE
 option		DISABLE_ADB_WITH_SERIAL_CONSOLE
-#option		MRG_ADB		  # Use ROM-based ADB driver
+#option		MRG_ADB		# Use ROM-based ADB driver
 
 config		bsd		root on rd0a
 maxusers	32
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index b0511ab8a8e..0badb1e9c33 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.81 2005/04/30 00:49:36 deraadt Exp $g
+#	$OpenBSD: GENERIC,v 1.82 2005/05/01 07:54:42 david Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -63,7 +63,7 @@ wdc*		at kauaiata?
 macobio0	at pci?
 gem*		at pci?		# GMAC ethernet
 hme*		at pci?		# HME ethernet
-vge*		at pci? 	# VIA VT612x
+vge*		at pci?		# VIA VT612x
 dc*		at pci?		# DEC Tulip 21143 clones
 xl*		at pci?		# 3C9xx ethernet
 rl*		at pci?		# RealTek 81[23]9 ethernet
@@ -210,7 +210,7 @@ ums*	at uhidev?		# USB mouse
 wsmouse* at ums? mux 0
 ukbd*	at uhidev?		# USB keyboard
 wskbd*	at ukbd? mux 1
-uhid*	at uhidev? 		# USB generic HID support
+uhid*	at uhidev?		# USB generic HID support
 aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
 atu*	at uhub?		# Atmel AT76c50x based 802.11b
 axe*	at uhub?		# ASIX Electronics AX88172 USB Ethernet
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index 131f4103b9b..025bfffbbdb 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.46 2005/04/26 22:10:35 dlg Exp $
+#	$OpenBSD: RAMDISK,v 1.47 2005/05/01 07:54:42 david Exp $
 #
 # PPC GENERIC config file
 #
@@ -63,7 +63,7 @@ wdc*		at kauaiata?
 macobio0	at pci?
 gem*		at pci?		# GMAC ethernet
 hme*		at pci?		# HME ethernet
-vge*		at pci? 	# VIA VT612x
+vge*		at pci?		# VIA VT612x
 dc*		at pci?		# DEC Tulip 21143 clones
 xl*		at pci?		# 3C9xx ethernet
 em*		at pci?		# Intel Pro/1000 ethernet
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index dd00808f2fc..78248b0fb51 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.46 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.47 2005/05/01 07:54:42 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -38,7 +38,7 @@ bugtty0 at mainbus0
 
 # MVME1x7 devices
 pcctwo0 at mainbus0 addr 0xfff00000		# MVME187
-bussw0  at mainbus0 addr 0xfff00000		# MVME197
+bussw0	at mainbus0 addr 0xfff00000		# MVME197
 sram0	at mainbus0 addr 0xffe00000		# MVME187
 pcctwo0 at bussw0 offset 0x00000		# MVME197
 clock0	at pcctwo0 ipl 5
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index 26bd0391bf0..cb51a5e9b14 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,4 +1,4 @@
-#	$OpenBSD: M197,v 1.26 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: M197,v 1.27 2005/05/01 07:54:42 david Exp $
 
 machine mvme88k m88k
 
@@ -20,7 +20,7 @@ mainbus0 at root
 
 # ------------------------------ mainbus devices ------------------------
 bugtty0 at mainbus0
-bussw0  at mainbus0 addr 0xfff00000
+bussw0	at mainbus0 addr 0xfff00000
 
 # ----------------------------- busswitch devices -----------------------
 pcctwo0 at bussw0 offset 0x00000
diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
index 3eeb710c607..d3d6825d0da 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.25 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: RAMDISK,v 1.26 2005/05/01 07:54:42 david Exp $
 
 machine		mvme88k m88k
 
@@ -39,7 +39,7 @@ config		bsd		root rd0 swap on rd0b
 mainbus0 at root
 
 bugtty0 at mainbus0
-bussw0  at mainbus0 addr 0xfff00000
+bussw0	at mainbus0 addr 0xfff00000
 pcctwo0 at mainbus0 addr 0xfff00000
 syscon0 at mainbus0 addr 0xfff00000
 
diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK
index aa0a7efc1e1..b4185133cc1 100644
--- a/sys/arch/mvmeppc/conf/RAMDISK
+++ b/sys/arch/mvmeppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.9 2004/09/16 09:35:36 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.10 2005/05/01 07:54:42 david Exp $
 #
 # MVMEPPC GENERIC config file
 #
@@ -86,7 +86,7 @@ sd0		at scsibus? target 0 lun 0
 #ss*		at scsibus?
 #uk*		at scsibus?
 
-pseudo-device	rd		 1	# ram disk
+pseudo-device	rd		1	# ram disk
 
 # RAMDISK stuff
 option		MINIROOTSIZE=8192
diff --git a/sys/arch/sgi/conf/RAMDISK b/sys/arch/sgi/conf/RAMDISK
index d6e3de41e27..b1424537c3f 100644
--- a/sys/arch/sgi/conf/RAMDISK
+++ b/sys/arch/sgi/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.11 2005/04/28 15:10:07 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.12 2005/05/01 07:54:42 david Exp $
 #
 
 machine		sgi mips64
@@ -114,8 +114,8 @@ cd*		at scsibus?
 #uk*		at scsibus?
 
 #### PSEUDO Devices
-pseudo-device	loop		 1	# network loopback
-pseudo-device	bpfilter	 1	# packet filter ports
+pseudo-device	loop		1	# network loopback
+pseudo-device	bpfilter	1	# packet filter ports
 
-pseudo-device	rd		 1	# Ram disk.
+pseudo-device	rd		1	# Ram disk.
 
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index e7d70a69e70..8de8a6629e9 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,5 +1,5 @@
-# 	$OpenBSD: RAMDISK,v 1.54 2005/04/14 20:15:58 brad Exp $
-# 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
+#	$OpenBSD: RAMDISK,v 1.55 2005/05/01 07:54:42 david Exp $
+#	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index df73d7aa0fd..92f7592a847 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -1,5 +1,5 @@
-#	$OpenBSD: SUN4,v 1.30 2004/09/27 19:32:38 miod Exp $
-# 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
+#	$OpenBSD: SUN4,v 1.31 2005/05/01 07:54:42 david Exp $
+#	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index e868eb146b5..09cb4bc94af 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,5 +1,5 @@
-#	$OpenBSD: SUN4C,v 1.51 2004/09/27 19:32:38 miod Exp $
-# 	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
+#	$OpenBSD: SUN4C,v 1.52 2005/05/01 07:54:42 david Exp $
+#	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc
@@ -63,7 +63,7 @@ spif*	at sbus?					# spif serial cards
 stty*	at spif?
 sbpp*	at spif?
 
-bpp*	at sbus?					# parallel port 
+bpp*	at sbus?					# parallel port
 
 # SUNW,xbox SBus Expansion Subsystem
 xbox*	at sbus?					# SBus Expansion box
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index d82d68c52f2..3ffdd558103 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,5 +1,5 @@
-#	$OpenBSD: SUN4M,v 1.66 2005/04/14 20:15:58 brad Exp $
-# 	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
+#	$OpenBSD: SUN4M,v 1.67 2005/05/01 07:54:42 david Exp $
+#	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc
@@ -121,8 +121,8 @@ le0	at lebuffer0					#
 le*	at lebuffer?					#
 
 # Additional SBus LANCE devices - unbuffered
-le0     at sbus0
-le*     at sbus?
+le0	at sbus0
+le*	at sbus?
 
 # HappyMeal ethernet
 hme*	at sbus?
@@ -150,8 +150,8 @@ tcx*	at sbus?
 wsdisplay* at tcx?
 
 # Sun "cgfourteen" accelerated 24-bit framebuffer.
-cgfourteen0 at obio0 addr 0x9c000000 		# sun4m
-cgfourteen1 at obio0 addr 0x90000000 		# sun4m
+cgfourteen0 at obio0 addr 0x9c000000		# sun4m
+cgfourteen1 at obio0 addr 0x90000000		# sun4m
 wsdisplay* at cgfourteen?
 
 # Sun "cgtwelve" (GS) accelerated 24-bit framebuffer.
@@ -213,11 +213,11 @@ ep*	at pcmcia?		# PCMCIA based 3C5xx ethernet
 bmtphy*	at mii?			# Broadcom 10/100 PHYs
 lxtphy*	at mii?			# Level1 LXT970 PHYs
 nsphy*	at mii?			# NS and compatible PHYs
-nsphyter* at mii? 
+nsphyter* at mii?
 qsphy*	at mii?			# Quality Semi QS6612 PHYs
 luphy*	at mii?			# Lucent LU6612 PHY
 tqphy*	at mii?			# TDK 78Q212x PHYs
-ukphy*	at mii? 
+ukphy*	at mii?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 5264cc52841..d00a0bb065e 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.124 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.125 2005/05/01 07:54:43 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -337,4 +337,4 @@ fd*	at fdc?
 #pseudo-device	hotplug	1		# devices hot plugging
 
 # mouse & keyboard multiplexor pseudo-devices
-#pseudo-device	wsmux 	2
+#pseudo-device	wsmux	2
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 0f8ef67a1c6..4487b754a10 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# 	$OpenBSD: RAMDISK,v 1.42 2005/04/14 19:59:49 brad Exp $
+#	$OpenBSD: RAMDISK,v 1.43 2005/05/01 07:54:43 david Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1
index 34eb606e30d..fd6bf335f8b 100644
--- a/sys/arch/sparc64/conf/RAMDISKU1
+++ b/sys/arch/sparc64/conf/RAMDISKU1
@@ -1,4 +1,4 @@
-# 	$OpenBSD: RAMDISKU1,v 1.14 2005/03/05 01:49:02 miod Exp $
+#	$OpenBSD: RAMDISKU1,v 1.15 2005/05/01 07:54:43 david Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5
index ccffacd5448..f7cde69f486 100644
--- a/sys/arch/sparc64/conf/RAMDISKU5
+++ b/sys/arch/sparc64/conf/RAMDISKU5
@@ -1,4 +1,4 @@
-# 	$OpenBSD: RAMDISKU5,v 1.8 2004/09/16 09:35:37 deraadt Exp $
+#	$OpenBSD: RAMDISKU5,v 1.9 2005/05/01 07:54:43 david Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 18c6790bead..092a70797db 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.38 2005/04/30 00:49:36 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.39 2005/05/01 07:54:43 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -9,7 +9,7 @@
 # of each device driver in this file see the section 4 man page for the
 # device.
 
-machine 	vax
+machine		vax
 include		"../../../conf/GENERIC"
 maxusers	8		# estimated number of users
 
@@ -75,10 +75,10 @@ smg0		at vsbus0 csr 0x200f0000 # Small monochrome display ctlr.
 #ry*		at hdc0 drive?		# RX floppies
 
 # Ibus, the internal bus on most Microvaxen
-uba0		at ibus0 		# Qbus adapter
-ze0		at ibus0 		# SGEC on-board ethernet
+uba0		at ibus0		# Qbus adapter
+ze0		at ibus0		# SGEC on-board ethernet
 le0		at ibus0		# LANCE ethernet (MV3400)
-#shac0		at ibus0 		# DSSI controller
+#shac0		at ibus0		# DSSI controller
 
 # Devices connected at VAXBI
 #cpu*		at bi? node?		# KA820/KA825 cpu
diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK
index e0c41187673..012f65fb4b8 100644
--- a/sys/arch/vax/conf/RAMDISK
+++ b/sys/arch/vax/conf/RAMDISK
@@ -1,6 +1,6 @@
-#	$OpenBSD: RAMDISK,v 1.23 2004/09/16 09:35:37 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.24 2005/05/01 07:54:43 david Exp $
 
-machine 	vax			# machine type
+machine		vax			# machine type
 
 #makeoptions	COPTS="-Os"		# untested
 makeoptions	COPTS="-O2"
@@ -14,16 +14,16 @@ option		MINIROOTSIZE=3072
 #option		VAX8200
 #option		VAX780		# 11/780
 #option		VAX750		# 11/750
-option 		VAX630		# MV II
-option 		VAX650		# MV III, 3300, 3600, 3800, 3900
+option		VAX630		# MV II
+option		VAX650		# MV III, 3300, 3600, 3800, 3900
 option		VAX660		# VAX 4000 200
-option	 	VAX670		# VAX 4000 300
+option		VAX670		# VAX 4000 300
 option		VAX680		# VAX 4000 {4,5,6,7}0{0,5}{,A}
-option	 	VAX410		# VS 2000, 3100/{30,}
-option 		VAX43		# VS 3100/76
-option 		VAX46		# VS 4000/60
+option		VAX410		# VS 2000, 3100/{30,}
+option		VAX43		# VS 3100/76
+option		VAX46		# VS 4000/60
 option		VAX48		# VS 4000 VLC
-option 		VAX49		# VS 4000/90
+option		VAX49		# VS 4000/90
 option		VAX53		# VAX 4000/10{0,5,6}
 
 maxusers	8		# estimated number of users
@@ -82,10 +82,10 @@ asc0		at vsbus0 csr 0x26000080 # VS4000/90 4000/10X MV3100/9X SCSI
 #ry*		at hdc0 drive?		# RX floppies
 
 # Ibus, the internal bus on most Microvaxen
-uba0		at ibus0 		# Qbus adapter
-ze0		at ibus0 		# SGEC on-board ethernet
+uba0		at ibus0		# Qbus adapter
+ze0		at ibus0		# SGEC on-board ethernet
 le0		at ibus0		# LANCE ethernet
-#shac0		at ibus0 		# DSSI controller
+#shac0		at ibus0		# DSSI controller
 
 # Devices connected at VAXBI
 #cpu*		at bi? node?		# KA820/KA825 cpu
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 9ec3d88860e..b122e773567 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.36 2005/04/30 01:02:37 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.37 2005/05/01 07:54:43 david Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -14,7 +14,7 @@ include		"../../../conf/GENERIC"
 maxusers	32			# estimated number of users
 
 options		ARM32
-#options 	ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
+#options	ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
 options		PXA2x0_INTR
 options		PXAGPIO_HAS_GPION_INTRS
 
@@ -27,9 +27,9 @@ makeoptions	BOARDTYPE="zaurus"
 options		APERTURE
 
 # CPU options
-options 	CPU_XSCALE_PXA2X0	# Support the XScale core
-#options 	XSCALE_CACHE_WRITE_THROUGH
-options 	XSCALE_CACHE_WRITE_BACK
+options		CPU_XSCALE_PXA2X0	# Support the XScale core
+#options	XSCALE_CACHE_WRITE_THROUGH
+options		XSCALE_CACHE_WRITE_BACK
 makeoptions	CPUFLAGS="-mcpu=xscale"
 
 option WSDISPLAY_COMPAT_USL		# VT handling
@@ -82,11 +82,11 @@ ubsa*		at uhub?		# Belkin serial adapter
 ucom*		at ubsa?
 uftdi*		at uhub?		# FTDI FT8U100AX serial adapter
 ucom*		at uftdi?
-uplcom* 	at uhub?		# I/O DATA USB-RSAQ2 serial adapter
+uplcom*		at uhub?		# I/O DATA USB-RSAQ2 serial adapter
 ucom*		at uplcom?
 umct*		at uhub?		# MCT USB-RS232 serial adapter
 ucom*		at umct?
-uaudio* 	at uhub?		# USB Audio
+uaudio*		at uhub?		# USB Audio
 audio*		at uaudio?
 umidi*		at uhub?		# USB MIDI
 midi*		at umidi?
@@ -138,7 +138,7 @@ options FFUARTCONSOLE
 pxapcic0	at pxaip?		# CF (pcmcia) support
 pcmcia*		at pxapcic?
 wi*		at pcmcia?
-ne* 		at pcmcia?
+ne*		at pcmcia?
 wdc*		at pcmcia?
 
 wd0		at wdc? flags 0x0000	# IDE hard drives
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index 2fb56d1fe20..a4dd0085c62 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.25 2005/04/30 00:36:26 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.26 2005/05/01 07:54:43 david Exp $
 
 machine	zaurus	arm
 
@@ -14,7 +14,7 @@ options	EXT2FS		# Second Extended Filesystem
 options	FIFO		# FIFOs; RECOMMENDED
 
 options		ARM32
-#options 	ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
+#options	ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
 options		PXA2x0_INTR
 options		PXAGPIO_HAS_GPION_INTRS
 
@@ -29,9 +29,9 @@ makeoptions	BOARDTYPE="zaurus"
 maxusers	32
 
 # CPU options
-options 	CPU_XSCALE_PXA2X0	# Support the XScale core
-#options 	XSCALE_CACHE_WRITE_THROUGH
-options 	XSCALE_CACHE_WRITE_BACK
+options		CPU_XSCALE_PXA2X0	# Support the XScale core
+#options	XSCALE_CACHE_WRITE_THROUGH
+options		XSCALE_CACHE_WRITE_BACK
 makeoptions	CPUFLAGS="-mcpu=xscale"
 
 #option WSDISPLAY_COMPAT_USL		# VT handling
@@ -105,9 +105,9 @@ cd*		at scsibus?
 
 # integrated 16550 UARTs
 options COM_PXA2X0
-com0	at pxaip?  addr 0x40100000 intr 22	# Full Function UART
-com1	at pxaip?  addr 0x40200000 intr 21	# BlueTooth UART
-#com2	at pxaip?  addr 0x40700000 intr 20	# Standard UART (for IrDA)
+com0	at pxaip? addr 0x40100000 intr 22	# Full Function UART
+com1	at pxaip? addr 0x40200000 intr 21	# BlueTooth UART
+#com2	at pxaip? addr 0x40700000 intr 20	# Standard UART (for IrDA)
 options FFUARTCONSOLE
 #options BTUARTCONSOLE
 
@@ -117,7 +117,7 @@ options FFUARTCONSOLE
 pxapcic0	at pxaip?
 pcmcia*		at pxapcic?
 wi*		at pcmcia?
-ne* 		at pcmcia?
+ne*		at pcmcia?
 wdc*		at pcmcia?
 
 # IDE hard drives