Align.

7 files changed, 77 insertions, 77 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 34d5235..2818123 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -920,12 +920,12 @@ dev/rp/rp_isa.c			optional rp isa
 dev/rp/rp_pci.c			optional rp pci
 dev/safe/safe.c			optional safe
 dev/sbsh/if_sbsh.c		optional sbsh
-dev/scc/scc_if.m		optional	scc
-dev/scc/scc_bfe_ebus.c		optional	scc ebus
-dev/scc/scc_bfe_sbus.c		optional	scc fhc | scc sbus
-dev/scc/scc_core.c		optional	scc
-dev/scc/scc_dev_sab82532.c	optional	scc
-dev/scc/scc_dev_z8530.c		optional	scc
+dev/scc/scc_if.m		optional scc
+dev/scc/scc_bfe_ebus.c		optional scc ebus
+dev/scc/scc_bfe_sbus.c		optional scc fhc | scc sbus
+dev/scc/scc_core.c		optional scc
+dev/scc/scc_dev_sab82532.c	optional scc
+dev/scc/scc_dev_z8530.c		optional scc
 dev/scd/scd.c			optional scd isa
 dev/scd/scd_isa.c		optional scd isa
 dev/si/si.c			optional si
@@ -1074,24 +1074,24 @@ dev/twe/twe.c			optional twe
 dev/twe/twe_freebsd.c		optional twe
 dev/tx/if_tx.c			optional tx
 dev/txp/if_txp.c		optional txp
-dev/uart/uart_bus_acpi.c	optional	uart acpi
-#dev/uart/uart_bus_cbus.c	optional	uart cbus
-dev/uart/uart_bus_ebus.c	optional	uart ebus
-dev/uart/uart_bus_isa.c		optional	uart isa
-dev/uart/uart_bus_pccard.c	optional	uart pccard
-dev/uart/uart_bus_pci.c		optional	uart pci
-dev/uart/uart_bus_puc.c		optional	uart puc
-dev/uart/uart_bus_scc.c		optional	uart scc
-dev/uart/uart_core.c		optional	uart
-dev/uart/uart_dbg.c		optional	uart gdb
-dev/uart/uart_dev_ns8250.c	optional	uart uart_ns8250
-dev/uart/uart_dev_sab82532.c	optional	uart uart_sab82532
-dev/uart/uart_dev_sab82532.c	optional	uart scc
-dev/uart/uart_dev_z8530.c	optional	uart uart_z8530
-dev/uart/uart_dev_z8530.c	optional	uart scc
-dev/uart/uart_if.m		optional	uart
-dev/uart/uart_subr.c		optional	uart
-dev/uart/uart_tty.c		optional	uart
+dev/uart/uart_bus_acpi.c	optional uart acpi
+#dev/uart/uart_bus_cbus.c	optional uart cbus
+dev/uart/uart_bus_ebus.c	optional uart ebus
+dev/uart/uart_bus_isa.c		optional uart isa
+dev/uart/uart_bus_pccard.c	optional uart pccard
+dev/uart/uart_bus_pci.c		optional uart pci
+dev/uart/uart_bus_puc.c		optional uart puc
+dev/uart/uart_bus_scc.c		optional uart scc
+dev/uart/uart_core.c		optional uart
+dev/uart/uart_dbg.c		optional uart gdb
+dev/uart/uart_dev_ns8250.c	optional uart uart_ns8250
+dev/uart/uart_dev_sab82532.c	optional uart uart_sab82532
+dev/uart/uart_dev_sab82532.c	optional uart scc
+dev/uart/uart_dev_z8530.c	optional uart uart_z8530
+dev/uart/uart_dev_z8530.c	optional uart scc
+dev/uart/uart_if.m		optional uart
+dev/uart/uart_subr.c		optional uart
+dev/uart/uart_tty.c		optional uart
 dev/ubsec/ubsec.c		optional ubsec
 #
 # USB support
@@ -1162,7 +1162,7 @@ dev/wl/if_wl.c			optional wl isa
 dev/xe/if_xe.c			optional xe
 dev/xe/if_xe_pccard.c		optional xe pccard
 fs/coda/coda_fbsd.c		optional vcoda
-fs/coda/coda_namecache.c		optional vcoda
+fs/coda/coda_namecache.c	optional vcoda
 fs/coda/coda_psdev.c		optional vcoda
 fs/coda/coda_subr.c		optional vcoda
 fs/coda/coda_venus.c		optional vcoda
@@ -1308,15 +1308,15 @@ geom/zero/g_zero.c		optional geom_zero
 gnu/fs/ext2fs/ext2_alloc.c		optional ext2fs \
 	warning "kernel contains GPL contaminated ext2fs filesystem"
 gnu/fs/ext2fs/ext2_balloc.c	optional ext2fs
-gnu/fs/ext2fs/ext2_bmap.c		optional ext2fs
-gnu/fs/ext2fs/ext2_inode.c		optional ext2fs
+gnu/fs/ext2fs/ext2_bmap.c	optional ext2fs
+gnu/fs/ext2fs/ext2_inode.c	optional ext2fs
 gnu/fs/ext2fs/ext2_inode_cnv.c	optional ext2fs
 gnu/fs/ext2fs/ext2_linux_balloc.c	optional ext2fs
 gnu/fs/ext2fs/ext2_linux_ialloc.c	optional ext2fs
 gnu/fs/ext2fs/ext2_lookup.c	optional ext2fs
-gnu/fs/ext2fs/ext2_subr.c		optional ext2fs
+gnu/fs/ext2fs/ext2_subr.c	optional ext2fs
 gnu/fs/ext2fs/ext2_vfsops.c	optional ext2fs
-gnu/fs/ext2fs/ext2_vnops.c		optional ext2fs
+gnu/fs/ext2fs/ext2_vnops.c	optional ext2fs
 gnu/fs/reiserfs/reiserfs_hashes.c	optional reiserfs \
 	warning "kernel contains GPL contaminated ReiserFS filesystem"
 gnu/fs/reiserfs/reiserfs_inode.c	optional reiserfs
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 2a9a60a..00d3263 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -60,7 +60,7 @@ opt_ah.h			optional	ath_hal			\
 nvenetlib.o			optional	nve pci			\
 	dependency	"$S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu"	\
 	compile-with	"uudecode $S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
- 	no-implicit-rule
+	no-implicit-rule
 #
 os+%DIKED-nve.h		optional	nve pci			\
 	dependency	"$S/contrib/dev/nve/os.h"			\
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index d095889..def4299 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -1,8 +1,8 @@
 # $FreeBSD$
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
-arm/arm/autoconf.c	standard
-arm/arm/bcopy_page.S	standard
+arm/arm/autoconf.c		standard
+arm/arm/bcopy_page.S		standard
 arm/arm/bcopyinout.S		standard
 arm/arm/blockio.S		standard
 arm/arm/bootconfig.c		standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index fc47798..87c4a23 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -32,7 +32,7 @@ svr4_assym.h			optional	compat_svr4		\
 	clean		"svr4_assym.h"
 #
 font.h				optional	sc_dflt_font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"									\
+	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"										\
 	no-obj no-implicit-rule before-depend				\
 	clean		"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 #
@@ -66,15 +66,15 @@ nvenetlib.o			optional	nve pci			\
 	compile-with	"uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \
 	no-implicit-rule
 #
-os+%DIKED-nve.h		optional	nve pci			\
+os+%DIKED-nve.h		optional	nve pci				\
 	dependency	"$S/contrib/dev/nve/os.h"			\
 	compile-with	"sed -e 's/^.*#include.*phy\.h.*$$//' $S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
 	no-implicit-rule no-obj before-depend				\
 	clean		"os+%DIKED-nve.h"
 #
 hptmvraid.o			optional	hptmv			\
-	dependency	"$S/dev/hptmv/i386-elf.raid.o.uu"	\
-	compile-with	"uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
+	dependency	"$S/dev/hptmv/i386-elf.raid.o.uu"		\
+	compile-with	"uudecode < $S/dev/hptmv/i386-elf.raid.o.uu"	\
 	no-implicit-rule
 #
 rr232x_lib.o			optional	rr232x			\
@@ -254,7 +254,7 @@ i386/cpufreq/p4tcc.c		optional cpufreq
 i386/cpufreq/powernow.c		optional cpufreq
 i386/cpufreq/smist.c		optional cpufreq
 #i386/i386/apic_vector.s		optional apic
-i386/i386/atomic.c		standard				\
+i386/i386/atomic.c		standard		\
 	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
 i386/i386/autoconf.c		standard
 i386/i386/bios.c		standard
@@ -338,18 +338,18 @@ i386/isa/spic.c			optional spic
 i386/isa/vesa.c			optional vga vesa
 i386/linux/imgact_linux.c	optional compat_linux
 i386/linux/linux_dummy.c	optional compat_linux
-i386/linux/linux_locore.s	optional compat_linux		\
+i386/linux/linux_locore.s	optional compat_linux	\
 	dependency 	"linux_assym.h"
 i386/linux/linux_machdep.c	optional compat_linux
 i386/linux/linux_ptrace.c	optional compat_linux
-i386/linux/linux_support.s	optional compat_linux		\
+i386/linux/linux_support.s	optional compat_linux	\
 	dependency 	"linux_assym.h"
 i386/linux/linux_sysent.c	optional compat_linux
 i386/linux/linux_sysvec.c	optional compat_linux
 i386/pci/pci_bus.c		optional pci
 i386/pci/pci_cfgreg.c		optional pci
 i386/pci/pci_pir.c		optional pci
-i386/svr4/svr4_locore.s		optional compat_svr4		\
+i386/svr4/svr4_locore.s		optional compat_svr4	\
 	dependency	"svr4_assym.h"	\
 	warning "COMPAT_SVR4 is broken and should be avoided"
 i386/svr4/svr4_machdep.c	optional compat_svr4
@@ -406,17 +406,17 @@ i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci
 #
 # isdn4bsd, ifpi2
 #
-i4b/layer1/ifpi2/i4b_ifpi2_pci.c	optional ifpi2 pci
-i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c	optional ifpi2 pci
-i4b/layer1/ifpi2/i4b_ifpi2_l1.c		optional ifpi2 pci
-i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c	optional ifpi2 pci
+i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 pci
+i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci
+i4b/layer1/ifpi2/i4b_ifpi2_l1.c	optional ifpi2 pci
+i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci
 #
 # isdn4bsd, ifpnp
 #
-i4b/layer1/ifpnp/i4b_ifpnp_avm.c	optional ifpnp
-i4b/layer1/ifpnp/i4b_ifpnp_isac.c	optional ifpnp
-i4b/layer1/ifpnp/i4b_ifpnp_l1.c		optional ifpnp
-i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c	optional ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_isac.c optional ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_l1.c	 optional ifpnp
+i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c optional ifpnp
 #
 # isdn4bsd, ihfc
 #
@@ -426,10 +426,10 @@ i4b/layer1/ihfc/i4b_ihfc_drv.c	optional ihfc
 #
 # isdn4bsd, itjc
 #
-i4b/layer1/itjc/i4b_itjc_pci.c		optional itjc
-i4b/layer1/itjc/i4b_itjc_isac.c		optional itjc
-i4b/layer1/itjc/i4b_itjc_l1.c		optional itjc
-i4b/layer1/itjc/i4b_itjc_l1fsm.c	optional itjc
+i4b/layer1/itjc/i4b_itjc_pci.c	optional itjc
+i4b/layer1/itjc/i4b_itjc_isac.c	optional itjc
+i4b/layer1/itjc/i4b_itjc_l1.c	optional itjc
+i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc
 #
 isa/syscons_isa.c		optional sc
 isa/vga_isa.c			optional vga
@@ -453,7 +453,7 @@ pci/agp_intel.c			optional agp
 pci/agp_nvidia.c		optional agp
 pci/agp_sis.c			optional agp
 pci/agp_via.c			optional agp
-i386/xbox/xbox.c		optional	xbox
-i386/xbox/xboxfb.c		optional	xboxfb
-dev/fb/boot_font.c		optional	xboxfb
-i386/xbox/pic16l.s		optional	xbox
+i386/xbox/xbox.c		optional xbox
+i386/xbox/xboxfb.c		optional xboxfb
+dev/fb/boot_font.c		optional xboxfb
+i386/xbox/pic16l.s		optional xbox
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index 3452716..f2f5b36 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -19,7 +19,7 @@ atkbdmap.h			optional	atkbd_dflt_keymap	\
 	clean		"atkbdmap.h"
 #
 font.h				optional	sc_dflt_font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"									\
+	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"										\
 	no-obj no-implicit-rule before-depend				\
 	clean		"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 #
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 2b61481..fc72f32 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -9,7 +9,7 @@
 #
 #
 
-font.h                          optional        sc            \
+font.h				optional	sc			\
         compile-with    "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
 	no-obj no-implicit-rule before-depend				\
 	clean	"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
@@ -100,8 +100,8 @@ libkern/ucmpdi2.c		standard
 libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
 
-powerpc/powerpc/mem.c		optional mem
-powerpc/powerpc/mp_machdep.c	optional smp
+powerpc/powerpc/mem.c		optional	mem
+powerpc/powerpc/mp_machdep.c	optional	smp
 
 powerpc/ofw/ofw_pci.c		optional	pci
 powerpc/ofw/ofw_pcib_pci.c	optional	pci
@@ -116,10 +116,10 @@ powerpc/powermac/openpic_macio.c optional	powermac pci
 powerpc/powermac/pswitch.c	optional	powermac pswitch
 powerpc/powermac/uninorth.c	optional	powermac pci
 
-powerpc/psim/iobus.c 		optional psim
-powerpc/psim/ata_iobus.c	optional ata psim
-powerpc/psim/openpic_iobus.c	optional psim
-powerpc/psim/uart_iobus.c	optional uart psim
+powerpc/psim/iobus.c 		optional	psim
+powerpc/psim/ata_iobus.c	optional	ata psim
+powerpc/psim/openpic_iobus.c	optional	psim
+powerpc/psim/uart_iobus.c	optional	uart psim
 
 dev/scc/scc_bfe_macio.c		optional	scc powermac
 
diff --git a/sys/conf/files.sun4v b/sys/conf/files.sun4v
index 250d848..37dfc32 100644
--- a/sys/conf/files.sun4v
+++ b/sys/conf/files.sun4v
@@ -38,13 +38,13 @@ sparc64/sparc64/clock.c		standard
 sparc64/sparc64/counter.c	standard
 sparc64/sparc64/db_disasm.c	optional	ddb
 sun4v/sun4v/db_interface.c	optional	ddb
-sun4v/sun4v/db_trace.c	optional	ddb
+sun4v/sun4v/db_trace.c		optional	ddb
 sun4v/sun4v/db_hwwatch.c	optional	ddb
 sun4v/sun4v/dump_machdep.c	standard
 sparc64/sparc64/elf_machdep.c	standard
-sun4v/sun4v/exception.S	standard	no-obj
+sun4v/sun4v/exception.S		standard	no-obj
 sparc64/sparc64/gdb_machdep.c	optional	gdb
-sun4v/sun4v/hv_pci.c	optional	pci
+sun4v/sun4v/hv_pci.c		optional	pci
 sun4v/sun4v/trap_trace.S	optional	trap_tracing
 sparc64/pci/ofw_pcib.c		optional	pci
 sparc64/pci/ofw_pcib_subr.c	optional	pci
@@ -52,26 +52,26 @@ sparc64/pci/ofw_pcibus.c	optional	pci
 sparc64/pci/ofw_pci_if.m	optional	pci
 
 # XXX hvcons should be optional
-sun4v/sun4v/hvcons.c	standard	
-sun4v/sun4v/hcall.S	standard
-sun4v/sun4v/hviommu.c	standard
+sun4v/sun4v/hvcons.c		standard
+sun4v/sun4v/hcall.S		standard
+sun4v/sun4v/hviommu.c		standard
 sparc64/sparc64/identcpu.c	standard
 sparc64/sparc64/in_cksum.c	optional	inet
-sun4v/sun4v/interrupt.S	standard	no-obj
+sun4v/sun4v/interrupt.S		standard	no-obj
 sun4v/sun4v/intr_machdep.c	standard
-sun4v/sun4v/locore.S	standard	no-obj
-sun4v/sun4v/machdep.c	standard
+sun4v/sun4v/locore.S		standard	no-obj
+sun4v/sun4v/machdep.c		standard
 sparc64/sparc64/mem.c		optional	mem
 sun4v/sun4v/mp_exception.S	optional	smp
-sun4v/sun4v/mp_locore.S	optional	smp
+sun4v/sun4v/mp_locore.S		optional	smp
 sun4v/sun4v/mp_machdep.c	optional	smp
 sun4v/sun4v/nexus.c		standard
-sun4v/cddl/t1_copy.S	standard
+sun4v/cddl/t1_copy.S		standard
 sparc64/sparc64/ofw_bus.c	standard
 sparc64/sparc64/ofw_machdep.c	standard
 sun4v/sun4v/pmap.c		standard
 sparc64/sparc64/prof_machdep.c	optional	profiling-routine
-sparc64/sparc64/rwindow.c		standard
+sparc64/sparc64/rwindow.c	standard
 sun4v/sun4v/rtc.c		standard
 sun4v/sun4v/simdisk.c		optional	simulator
 sun4v/sun4v/support.S		standard
@@ -101,4 +101,4 @@ sun4v/cddl/mdesc/mdesc_findnodeprop.c	standard
 sun4v/cddl/mdesc/mdesc_rootnode.c	standard
 sun4v/cddl/mdesc/mdesc_scandag.c	standard
 sun4v/mdesc/mdesc_vdevfindnode.c	standard
-sun4v/mdesc/mdesc_vdevfindval.c		standard
+sun4v/mdesc/mdesc_vdevfindval.c	standard