1 files changed, 158 insertions, 158 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 17877d6a5ad9..e33ec6c6a3a7 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -60,10 +60,6 @@ usbdevs_data.h			optional usb				   \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"usbdevs_data.h"
-kern/device_if.m		standard
-kern/bus_if.m			standard
-kern/clock_if.m			optional genclock
-kern/linker_if.m		standard
 cam/cam.c			optional scbus
 cam/cam_periph.c		optional scbus
 cam/cam_queue.c			optional scbus
@@ -234,6 +230,28 @@ contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet
 contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet
 contrib/ipfilter/netinet/ip_state.c optional ipfilter inet
 contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet
+contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm
+contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm
+contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm
+contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm
+contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm
+contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm
+contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm
+contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase
+contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase
+contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase
+contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase
+contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase
+contrib/ngatm/netnatm/saal/saal_sscfu.c	optional ngatm_sscfu
+contrib/ngatm/netnatm/saal/saal_sscop.c	optional ngatm_sscop
+contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni
+contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni
 contrib/pf/net/if_pflog.c	optional pflog
 contrib/pf/net/if_pfsync.c	optional pfsync
 contrib/pf/net/pf.c		optional pf
@@ -245,15 +263,29 @@ contrib/pf/net/pf_table.c	optional pf
 contrib/pf/net/pf_osfp.c	optional pf
 contrib/pf/netinet/in4_cksum.c	optional pf inet
 crypto/blowfish/bf_ecb.c	optional ipsec ipsec_esp
+crypto/blowfish/bf_skey.c	optional crypto
 crypto/blowfish/bf_skey.c	optional ipsec ipsec_esp
 crypto/cast128/cast128.c	optional ipsec ipsec_esp
+crypto/des/des_ecb.c		optional crypto
 crypto/des/des_ecb.c		optional ipsec ipsec_esp
+crypto/des/des_setkey.c		optional crypto
 crypto/des/des_setkey.c		optional ipsec ipsec_esp
+crypto/rc4/rc4.c		optional netgraph_mppc_encryption
+crypto/rijndael/rijndael-alg-fst.c optional geom_bde
 crypto/rijndael/rijndael-alg-fst.c optional ipsec
+crypto/rijndael/rijndael-alg-fst.c optional random
+crypto/rijndael/rijndael-alg-fst.c optional wlan_ccmp
+crypto/rijndael/rijndael-api-fst.c optional geom_bde
+crypto/rijndael/rijndael-api-fst.c optional random
 crypto/rijndael/rijndael-api.c	optional ipsec
-opencrypto/rmd160.c		optional ipsec
+crypto/rijndael/rijndael-api.c	optional wlan_ccmp
+crypto/sha1.c			optional netgraph_mppc_encryption
+crypto/sha1.c			optional crypto
 crypto/sha1.c			optional ipsec
+crypto/sha2/sha2.c		optional crypto
+crypto/sha2/sha2.c		optional geom_bde
 crypto/sha2/sha2.c		optional ipsec
+crypto/sha2/sha2.c		optional random
 ddb/db_access.c			optional	ddb
 ddb/db_break.c			optional	ddb
 ddb/db_command.c		optional	ddb
@@ -271,17 +303,26 @@ ddb/db_thread.c			optional	ddb
 ddb/db_variables.c		optional	ddb
 ddb/db_watch.c			optional	ddb
 ddb/db_write_cmd.c		optional	ddb
+#dev/dpt/dpt_control.c		optional dpt
 dev/aac/aac.c			optional aac
+dev/aac/aac_cam.c		optional aacp aac
 dev/aac/aac_debug.c		optional aac
 dev/aac/aac_disk.c		optional aac
-dev/aac/aac_pci.c		optional aac pci
-dev/aac/aac_cam.c		optional aacp aac
 dev/aac/aac_linux.c		optional aac compat_linux
+dev/aac/aac_pci.c		optional aac pci
 dev/acpi_support/acpi_asus.c	optional acpi_asus acpi
+dev/acpi_support/acpi_ibm.c	optional acpi_ibm acpi
 dev/acpi_support/acpi_panasonic.c optional acpi_panasonic acpi
 dev/acpi_support/acpi_sony.c	optional acpi_sony acpi
-dev/acpi_support/acpi_ibm.c	optional acpi_ibm acpi
 dev/acpi_support/acpi_toshiba.c	optional acpi_toshiba acpi
+dev/acpica/Osd/OsdDebug.c	optional acpi
+dev/acpica/Osd/OsdHardware.c	optional acpi
+dev/acpica/Osd/OsdInterrupt.c	optional acpi
+dev/acpica/Osd/OsdMemory.c	optional acpi
+dev/acpica/Osd/OsdSchedule.c	optional acpi
+dev/acpica/Osd/OsdStream.c	optional acpi
+dev/acpica/Osd/OsdSynch.c	optional acpi
+dev/acpica/Osd/OsdTable.c	optional acpi
 dev/acpica/acpi.c		optional acpi
 dev/acpica/acpi_acad.c		optional acpi
 dev/acpica/acpi_battery.c	optional acpi
@@ -302,14 +343,6 @@ dev/acpica/acpi_quirk.c		optional acpi
 dev/acpica/acpi_resource.c	optional acpi
 dev/acpica/acpi_thermal.c	optional acpi
 dev/acpica/acpi_timer.c		optional acpi
-dev/acpica/Osd/OsdDebug.c	optional acpi
-dev/acpica/Osd/OsdHardware.c	optional acpi
-dev/acpica/Osd/OsdInterrupt.c	optional acpi
-dev/acpica/Osd/OsdMemory.c	optional acpi
-dev/acpica/Osd/OsdSchedule.c	optional acpi
-dev/acpica/Osd/OsdStream.c	optional acpi
-dev/acpica/Osd/OsdSynch.c	optional acpi
-dev/acpica/Osd/OsdTable.c	optional acpi
 dev/acpica/acpi_video.c		optional acpi_video acpi
 dev/adlink/adlink.c		optional adlink
 dev/advansys/adv_eisa.c		optional adv eisa
@@ -327,21 +360,21 @@ dev/aha/aha_mca.c		optional aha mca
 dev/ahb/ahb.c			optional ahb eisa
 dev/aic/aic.c			optional aic
 dev/aic/aic_pccard.c		optional aic pccard
-dev/aic7xxx/aic7770.c		optional ahc
 dev/aic7xxx/ahc_eisa.c		optional ahc eisa
 dev/aic7xxx/ahc_isa.c		optional ahc isa
 dev/aic7xxx/ahc_pci.c		optional ahc pci
-dev/aic7xxx/aic7xxx.c		optional ahc
-dev/aic7xxx/aic7xxx_93cx6.c	optional ahc
-dev/aic7xxx/aic7xxx_osm.c	optional ahc
-dev/aic7xxx/aic7xxx_pci.c	optional ahc pci
 dev/aic7xxx/ahd_pci.c		optional ahd pci
+dev/aic7xxx/aic7770.c		optional ahc
 dev/aic7xxx/aic79xx.c		optional ahd pci
 dev/aic7xxx/aic79xx_osm.c	optional ahd pci
 dev/aic7xxx/aic79xx_pci.c	optional ahd pci
+dev/aic7xxx/aic7xxx.c		optional ahc
+dev/aic7xxx/aic7xxx_93cx6.c	optional ahc
+dev/aic7xxx/aic7xxx_osm.c	optional ahc
+dev/aic7xxx/aic7xxx_pci.c	optional ahc pci
 dev/amd/amd.c			optional amd
-dev/amr/amr_cam.c		optional amr
 dev/amr/amr.c			optional amr
+dev/amr/amr_cam.c		optional amr
 dev/amr/amr_disk.c		optional amr
 dev/amr/amr_pci.c		optional amr pci
 dev/an/if_an.c			optional an
@@ -350,24 +383,24 @@ dev/an/if_an_pccard.c		optional an pccard
 dev/an/if_an_pci.c		optional an pci
 dev/asr/asr.c			optional asr pci
 dev/ata/ata-all.c		optional ata
-dev/ata/ata-queue.c		optional ata
-dev/ata/ata-lowlevel.c		optional ata
-dev/ata/ata-isa.c		optional ata isa
-dev/ata/ata-cbus.c		optional ata pc98
 dev/ata/ata-card.c		optional ata pccard
-dev/ata/ata-pci.c		optional ata pci
+dev/ata/ata-cbus.c		optional ata pc98
 dev/ata/ata-chipset.c		optional ata pci
-dev/ata/ata-dma.c		optional ata pci
 dev/ata/ata-disk.c		optional atadisk
+dev/ata/ata-dma.c		optional ata pci
+dev/ata/ata-isa.c		optional ata isa
+dev/ata/ata-lowlevel.c		optional ata
+dev/ata/ata-pci.c		optional ata pci
+dev/ata/ata-queue.c		optional ata
 dev/ata/ata-raid.c		optional ataraid
+dev/ata/atapi-cam.c		optional atapicam
 dev/ata/atapi-cd.c		optional atapicd
 dev/ata/atapi-fd.c		optional atapifd
 dev/ata/atapi-tape.c		optional atapist
-dev/ata/atapi-cam.c		optional atapicam
-dev/ath/if_ath.c		optional ath
-dev/ath/if_ath_pci.c		optional ath pci
 dev/ath/ath_rate/amrr/amrr.c 	optional ath_rate_amrr
 dev/ath/ath_rate/onoe/onoe.c 	optional ath_rate_onoe
+dev/ath/if_ath.c		optional ath
+dev/ath/if_ath_pci.c		optional ath pci
 dev/awi/am79c930.c		optional awi
 dev/awi/awi.c			optional awi
 dev/awi/if_awi_pccard.c		optional awi pccard
@@ -399,9 +432,6 @@ dev/cy/cy_pci.c			optional cy pci
 dev/dcons/dcons.c		optional dcons
 dev/dcons/dcons_crom.c		optional dcons_crom
 dev/dcons/dcons_os.c		optional dcons
-dev/digi/digi.c			optional digi
-dev/digi/digi_isa.c		optional digi isa
-dev/digi/digi_pci.c		optional digi pci
 dev/digi/CX.c			optional digi_CX
 dev/digi/CX_PCI.c		optional digi_CX_PCI
 dev/digi/EPCX.c			optional digi_EPCX
@@ -409,7 +439,9 @@ dev/digi/EPCX_PCI.c		optional digi_EPCX_PCI
 dev/digi/Xe.c			optional digi_Xe
 dev/digi/Xem.c			optional digi_Xem
 dev/digi/Xr.c			optional digi_Xr
-#dev/dpt/dpt_control.c		optional dpt
+dev/digi/digi.c			optional digi
+dev/digi/digi_isa.c		optional digi isa
+dev/digi/digi_pci.c		optional digi pci
 dev/dpt/dpt_eisa.c		optional dpt eisa
 dev/dpt/dpt_pci.c		optional dpt pci
 dev/dpt/dpt_scsi.c		optional dpt
@@ -440,8 +472,8 @@ dev/eisa/eisa_if.m		standard
 dev/eisa/eisaconf.c		optional eisa
 dev/em/if_em.c			optional em
 dev/em/if_em_hw.c		optional em
-dev/en/midway.c			optional en
 dev/en/if_en_pci.c		optional en pci
+dev/en/midway.c			optional en
 dev/ep/if_ep.c			optional ep
 dev/ep/if_ep_eisa.c		optional ep eisa
 dev/ep/if_ep_isa.c		optional ep isa
@@ -487,8 +519,8 @@ dev/hfa/fore_stats.c		optional hfa
 dev/hfa/fore_timer.c		optional hfa
 dev/hfa/fore_transmit.c		optional hfa
 dev/hfa/fore_vcm.c		optional hfa
-dev/hfa/hfa_freebsd.c		optional hfa
 #dev/hfa/hfa_eisa.c		optional hfa eisa
+dev/hfa/hfa_freebsd.c		optional hfa
 dev/hfa/hfa_pci.c		optional hfa pci
 #dev/hfa/hfa_sbus.c		optional hfa sbus
 dev/hifn/hifn7751.c		optional hifn
@@ -503,12 +535,12 @@ dev/ida/ida_eisa.c		optional ida eisa
 dev/ida/ida_pci.c		optional ida pci
 dev/ie/if_ie.c			optional ie isa nowerror
 dev/ie/if_ie_isa.c		optional ie isa
-dev/iicbus/iicbb_if.m		optional iicbb
-dev/iicbus/iicbus_if.m		optional iicbus
 dev/iicbus/if_ic.c		optional ic
 dev/iicbus/iic.c		optional iic
 dev/iicbus/iicbb.c		optional iicbb
+dev/iicbus/iicbb_if.m		optional iicbb
 dev/iicbus/iicbus.c		optional iicbus
+dev/iicbus/iicbus_if.m		optional iicbus
 dev/iicbus/iiconf.c		optional iicbus
 dev/iicbus/iicsmb.c		optional iicsmb				\
 	dependency	"iicbus_if.h"
@@ -516,19 +548,19 @@ dev/iir/iir.c			optional iir
 dev/iir/iir_ctrl.c		optional iir
 dev/iir/iir_pci.c		optional iir pci
 dev/ips/ips.c			optional ips
-dev/ips/ips_pci.c		optional ips pci
-dev/ips/ips_disk.c		optional ips
 dev/ips/ips_commands.c		optional ips
+dev/ips/ips_disk.c		optional ips
 dev/ips/ips_ioctl.c		optional ips
+dev/ips/ips_pci.c		optional ips pci
 dev/isp/isp.c			optional isp
 dev/isp/isp_freebsd.c		optional isp
-dev/isp/isp_target.c		optional isp
 dev/isp/isp_pci.c		optional isp pci
 dev/isp/isp_sbus.c		optional isp sbus
+dev/isp/isp_target.c		optional isp
 dev/ispfw/ispfw.c		optional ispfw
-dev/ixgb/ixgb_hw.c		optional ixgb
-dev/ixgb/ixgb_ee.c		optional ixgb
 dev/ixgb/if_ixgb.c		optional ixgb
+dev/ixgb/ixgb_ee.c		optional ixgb
+dev/ixgb/ixgb_hw.c		optional ixgb
 dev/joy/joy.c			optional joy
 dev/joy/joy_isa.c		optional joy isa
 dev/joy/joy_pccard.c		optional joy pccard
@@ -536,16 +568,13 @@ dev/led/led.c			standard
 dev/lge/if_lge.c		optional lge
 dev/lnc/if_lnc.c		optional lnc
 dev/lnc/if_lnc_pci.c		optional lnc pci
-dev/ncv/ncr53c500.c		optional ncv
-dev/ncv/ncr53c500_pccard.c	optional ncv pccard
-dev/nsp/nsp.c			optional nsp
-dev/nsp/nsp_pccard.c		optional nsp pccard
 dev/mc146818/mc146818.c		optional mc146818
 dev/mca/mca_bus.c		optional mca
 dev/mcd/mcd.c			optional mcd isa nowerror
 dev/mcd/mcd_isa.c		optional mcd isa nowerror
 dev/md/md.c			optional md
 dev/mem/memdev.c		optional mem
+dev/mii/acphy.c			optional miibus
 dev/mii/amphy.c			optional miibus
 dev/mii/bmtphy.c		optional miibus
 dev/mii/brgphy.c		optional miibus
@@ -554,13 +583,16 @@ dev/mii/dcphy.c			optional miibus pci
 dev/mii/e1000phy.c		optional miibus
 dev/mii/exphy.c			optional miibus
 dev/mii/inphy.c			optional miibus
+dev/mii/lxtphy.c		optional miibus
 dev/mii/mii.c			optional miibus
 dev/mii/mii_physubr.c		optional miibus
+dev/mii/miibus_if.m		optional miibus
 dev/mii/mlphy.c			optional miibus
-dev/mii/nsphy.c			optional miibus
 dev/mii/nsgphy.c		optional miibus
-dev/mii/pnphy.c			optional miibus
+dev/mii/nsphy.c			optional miibus
 dev/mii/pnaphy.c		optional miibus
+dev/mii/pnphy.c			optional miibus
+dev/mii/qsphy.c			optional miibus
 dev/mii/rgephy.c		optional miibus
 dev/mii/rlphy.c			optional miibus
 dev/mii/ruephy.c		optional miibus
@@ -569,10 +601,6 @@ dev/mii/tlphy.c			optional miibus
 dev/mii/ukphy.c			optional miibus
 dev/mii/ukphy_subr.c		optional miibus
 dev/mii/xmphy.c			optional miibus
-dev/mii/lxtphy.c		optional miibus
-dev/mii/qsphy.c			optional miibus
-dev/mii/acphy.c			optional miibus
-dev/mii/miibus_if.m		optional miibus
 dev/mk48txx/mk48txx.c		optional mk48txx
 dev/mlx/mlx.c			optional mlx
 dev/mlx/mlx_disk.c		optional mlx
@@ -582,18 +610,22 @@ dev/mpt/mpt.c			optional mpt
 dev/mpt/mpt_debug.c		optional mpt
 dev/mpt/mpt_freebsd.c		optional mpt
 dev/mpt/mpt_pci.c		optional mpt pci
-dev/my/if_my.c			optional my
 dev/musycc/musycc.c		optional musycc
+dev/my/if_my.c			optional my
+dev/ncv/ncr53c500.c		optional ncv
+dev/ncv/ncr53c500_pccard.c	optional ncv pccard
 dev/nge/if_nge.c		optional nge
 dev/nmdm/nmdm.c			optional nmdm
+dev/nsp/nsp.c			optional nsp
+dev/nsp/nsp_pccard.c		optional nsp pccard
 dev/null/null.c			standard
 dev/patm/if_patm.c		optional patm pci
+dev/patm/if_patm_attach.c	optional patm pci
 dev/patm/if_patm_intr.c		optional patm pci
 dev/patm/if_patm_ioctl.c	optional patm pci
+dev/patm/if_patm_rtables.c	optional patm pci
 dev/patm/if_patm_rx.c		optional patm pci
 dev/patm/if_patm_tx.c		optional patm pci
-dev/patm/if_patm_attach.c	optional patm pci
-dev/patm/if_patm_rtables.c	optional patm pci
 dev/pbio/pbio.c			optional pbio isa
 dev/pccard/card_if.m		standard
 dev/pccard/pccard.c		optional pccard
@@ -618,7 +650,6 @@ dev/pdq/pdq.c			optional fea eisa nowerror
 dev/pdq/pdq.c			optional fpa pci nowerror
 dev/pdq/pdq_ifsubr.c		optional fea eisa nowerror
 dev/pdq/pdq_ifsubr.c		optional fpa pci nowerror
-dev/ppbus/ppbus_if.m		optional ppbus
 dev/ppbus/if_plip.c		optional plip
 dev/ppbus/immio.c		optional vpo
 dev/ppbus/lpbb.c		optional lpbb
@@ -628,28 +659,26 @@ dev/ppbus/ppb_1284.c		optional ppbus
 dev/ppbus/ppb_base.c		optional ppbus
 dev/ppbus/ppb_msq.c		optional ppbus
 dev/ppbus/ppbconf.c		optional ppbus
+dev/ppbus/ppbus_if.m		optional ppbus
 dev/ppbus/ppi.c			optional ppi
 dev/ppbus/pps.c			optional pps
 dev/ppbus/vpo.c			optional vpo
 dev/ppbus/vpoio.c		optional vpo
-dev/pst/pst-pci.c		optional pst pci
 dev/pst/pst-iop.c		optional pst
+dev/pst/pst-pci.c		optional pst pci
 dev/pst/pst-raid.c		optional pst
 dev/puc/puc.c			optional puc
 dev/puc/puc_ebus.c		optional puc ebus
-dev/puc/puc_pci.c		optional puc pci
 dev/puc/puc_pccard.c		optional puc pccard
+dev/puc/puc_pci.c		optional puc pci
 dev/puc/puc_sbus.c		optional puc sbus
 dev/puc/pucdata.c		optional puc pci
 dev/random/harvest.c		standard
+dev/random/hash.c		optional random
+dev/random/probe.c		optional random
 dev/random/randomdev.c		optional random
 dev/random/randomdev_soft.c	optional random
-dev/random/probe.c		optional random
 dev/random/yarrow.c		optional random
-dev/random/hash.c		optional random
-crypto/rijndael/rijndael-alg-fst.c optional random
-crypto/rijndael/rijndael-api-fst.c optional random
-crypto/sha2/sha2.c		optional random
 dev/ray/if_ray.c		optional ray pccard
 dev/rc/rc.c			optional rc
 dev/re/if_re.c			optional re
@@ -671,10 +700,10 @@ dev/si/si_pci.c			optional si pci
 dev/sio/sio_pccard.c		optional sio pccard
 dev/sio/sio_pci.c		optional sio pci
 dev/sio/sio_puc.c		optional sio puc pci
-dev/smbus/smbus_if.m		optional smbus
 dev/smbus/smb.c			optional smb
 dev/smbus/smbconf.c		optional smbus
 dev/smbus/smbus.c		optional smbus
+dev/smbus/smbus_if.m		optional smbus
 dev/sn/if_sn.c			optional sn
 dev/sn/if_sn_isa.c		optional sn isa
 dev/sn/if_sn_pccard.c		optional sn pccard
@@ -710,16 +739,16 @@ dev/sound/pci/via82c686.c	optional snd_via82c686 pci
 dev/sound/pci/vibes.c		optional snd_vibes pci
 #dev/sound/pci/vortex1.c	optional snd_vortex1 pci
 dev/sound/pcm/ac97.c		optional sound
-dev/sound/pcm/ac97_patch.c	optional sound
 dev/sound/pcm/ac97_if.m		optional sound
+dev/sound/pcm/ac97_patch.c	optional sound
 dev/sound/pcm/buffer.c		optional sound
 dev/sound/pcm/channel.c		optional sound
 dev/sound/pcm/channel_if.m	optional sound
 dev/sound/pcm/dsp.c		optional sound
 dev/sound/pcm/fake.c		optional sound
 dev/sound/pcm/feeder.c		optional sound
-dev/sound/pcm/feeder_if.m	optional sound
 dev/sound/pcm/feeder_fmt.c	optional sound
+dev/sound/pcm/feeder_if.m	optional sound
 dev/sound/pcm/feeder_rate.c	optional sound
 dev/sound/pcm/mixer.c		optional sound
 dev/sound/pcm/mixer_if.m	optional sound
@@ -731,15 +760,15 @@ dev/sound/usb/uaudio.c		optional snd_uaudio usb
 dev/sound/usb/uaudio_pcm.c	optional snd_uaudio usb
 dev/sr/if_sr.c			optional sr
 dev/sr/if_sr_pci.c		optional sr pci
-dev/streams/streams.c		optional streams
 dev/stg/tmc18c30.c		optional stg
-dev/stg/tmc18c30_subr.c		optional stg
+dev/stg/tmc18c30_isa.c		optional stg isa
 dev/stg/tmc18c30_pccard.c	optional stg pccard
 dev/stg/tmc18c30_pci.c		optional stg pci
-dev/stg/tmc18c30_isa.c		optional stg isa
+dev/stg/tmc18c30_subr.c		optional stg
+dev/streams/streams.c		optional streams
 dev/sx/sx.c			optional sx
-dev/sx/sx_util.c		optional sx
 #dev/sx/sx_isa.c		optional sx isa
+dev/sx/sx_util.c		optional sx
 dev/sx/sx_pci.c			optional sx pci
 dev/sym/sym_hipd.c		optional sym				\
 	dependency	"$S/dev/sym/sym_{conf,defs}.h"
@@ -748,8 +777,8 @@ dev/syscons/daemon/daemon_saver.c optional daemon_saver
 dev/syscons/fade/fade_saver.c	optional fade_saver
 dev/syscons/fire/fire_saver.c	optional fire_saver
 dev/syscons/green/green_saver.c	optional green_saver
-dev/syscons/logo/logo_saver.c	optional logo_saver
 dev/syscons/logo/logo.c		optional logo_saver
+dev/syscons/logo/logo_saver.c	optional logo_saver
 dev/syscons/rain/rain_saver.c	optional rain_saver
 dev/syscons/star/star_saver.c	optional star_saver
 dev/syscons/warp/warp_saver.c	optional warp_saver
@@ -764,11 +793,10 @@ 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_if.m		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_cbus.c	optional	uart cbus
 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
@@ -777,21 +805,21 @@ dev/uart/uart_dbg.c		optional	uart gdb
 dev/uart/uart_dev_ns8250.c	optional	uart
 dev/uart/uart_dev_sab82532.c	optional	uart
 dev/uart/uart_dev_z8530.c	optional	uart
+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
-dev/usb/usb_if.m		optional usb
+dev/usb/ehci.c			optional ehci
+dev/usb/ehci_pci.c		optional ehci pci
 dev/usb/hid.c			optional usb
 dev/usb/if_aue.c		optional aue
 dev/usb/if_axe.c		optional axe
 dev/usb/if_cue.c		optional cue
-dev/usb/if_udav.c		optional udav
 dev/usb/if_kue.c		optional kue
 dev/usb/if_rue.c		optional rue
-dev/usb/ehci.c			optional ehci
-dev/usb/ehci_pci.c		optional ehci pci
+dev/usb/if_udav.c		optional udav
 dev/usb/ohci.c			optional ohci
 dev/usb/ohci_pci.c		optional ohci pci
 dev/usb/ubsa.c			optional ubsa ucom
@@ -814,16 +842,17 @@ dev/usb/umodem.c		optional umodem
 dev/usb/ums.c			optional ums
 dev/usb/uplcom.c		optional uplcom ucom
 dev/usb/urio.c			optional urio
-dev/usb/uscanner.c		optional uscanner
-dev/usb/uvisor.c		optional uvisor ucom
-dev/usb/uvscom.c		optional uvscom ucom
 dev/usb/usb.c			optional usb
 dev/usb/usb_ethersubr.c		optional usb
+dev/usb/usb_if.m		optional usb
 dev/usb/usb_mem.c		optional usb
 dev/usb/usb_quirks.c		optional usb
 dev/usb/usb_subr.c		optional usb
 dev/usb/usbdi.c			optional usb
 dev/usb/usbdi_util.c		optional usb
+dev/usb/uscanner.c		optional uscanner
+dev/usb/uvisor.c		optional uvisor ucom
+dev/usb/uvscom.c		optional uvscom ucom
 dev/utopia/utopia.c		optional utopia
 dev/vge/if_vge.c		optional vge
 dev/vkbd/vkbd.c			optional vkbd
@@ -858,17 +887,17 @@ fs/hpfs/hpfs_vnops.c		optional hpfs
 fs/msdosfs/msdosfs_conv.c	optional msdosfs
 fs/msdosfs/msdosfs_denode.c	optional msdosfs
 fs/msdosfs/msdosfs_fat.c	optional msdosfs
+fs/msdosfs/msdosfs_fileno.c	optional msdosfs_large
+fs/msdosfs/msdosfs_iconv.c	optional msdosfs_iconv
 fs/msdosfs/msdosfs_lookup.c	optional msdosfs
 fs/msdosfs/msdosfs_vfsops.c	optional msdosfs
 fs/msdosfs/msdosfs_vnops.c	optional msdosfs
-fs/msdosfs/msdosfs_fileno.c	optional msdosfs_large
-fs/msdosfs/msdosfs_iconv.c	optional msdosfs_iconv
 fs/ntfs/ntfs_compr.c		optional ntfs
+fs/ntfs/ntfs_iconv.c		optional ntfs_iconv
 fs/ntfs/ntfs_ihash.c		optional ntfs
 fs/ntfs/ntfs_subr.c		optional ntfs
 fs/ntfs/ntfs_vfsops.c		optional ntfs
 fs/ntfs/ntfs_vnops.c		optional ntfs
-fs/ntfs/ntfs_iconv.c		optional ntfs_iconv
 fs/nullfs/null_subr.c		optional nullfs
 fs/nullfs/null_vfsops.c		optional nullfs
 fs/nullfs/null_vnops.c		optional nullfs
@@ -902,10 +931,10 @@ fs/smbfs/smbfs_smb.c		optional smbfs
 fs/smbfs/smbfs_subr.c		optional smbfs
 fs/smbfs/smbfs_vfsops.c		optional smbfs
 fs/smbfs/smbfs_vnops.c		optional smbfs
+fs/udf/osta.c			optional udf
 fs/udf/udf_iconv.c		optional udf_iconv
 fs/udf/udf_vfsops.c		optional udf
 fs/udf/udf_vnops.c		optional udf
-fs/udf/osta.c			optional udf
 fs/umapfs/umap_subr.c		optional umapfs
 fs/umapfs/umap_vfsops.c		optional umapfs
 fs/umapfs/umap_vnops.c		optional umapfs
@@ -918,22 +947,8 @@ geom/bde/g_bde.c		optional geom_bde
 geom/bde/g_bde_crypt.c		optional geom_bde
 geom/bde/g_bde_lock.c		optional geom_bde
 geom/bde/g_bde_work.c		optional geom_bde
-crypto/rijndael/rijndael-alg-fst.c optional geom_bde
-crypto/rijndael/rijndael-api-fst.c optional geom_bde
-crypto/sha2/sha2.c		optional geom_bde
 geom/concat/g_concat.c		optional geom_concat
 geom/gate/g_gate.c		optional geom_gate
-geom/label/g_label.c		optional geom_label
-geom/label/g_label_iso9660.c	optional geom_label
-geom/label/g_label_msdosfs.c	optional geom_label
-geom/label/g_label_ufs.c	optional geom_label
-geom/mirror/g_mirror.c		optional geom_mirror
-geom/mirror/g_mirror_ctl.c	optional geom_mirror
-geom/nop/g_nop.c		optional geom_nop
-geom/raid3/g_raid3.c		optional geom_raid3
-geom/raid3/g_raid3_ctl.c	optional geom_raid3
-geom/stripe/g_stripe.c		optional geom_stripe
-geom/uzip/g_uzip.c		optional geom_uzip
 geom/geom_aes.c			optional geom_aes
 geom/geom_apple.c		optional geom_apple
 geom/geom_bsd.c			optional geom_bsd
@@ -959,6 +974,17 @@ geom/geom_sunlabel.c		optional geom_sunlabel
 geom/geom_sunlabel_enc.c	optional geom_sunlabel
 geom/geom_vfs.c			standard
 geom/geom_vol_ffs.c		optional geom_vol
+geom/label/g_label.c		optional geom_label
+geom/label/g_label_iso9660.c	optional geom_label
+geom/label/g_label_msdosfs.c	optional geom_label
+geom/label/g_label_ufs.c	optional geom_label
+geom/mirror/g_mirror.c		optional geom_mirror
+geom/mirror/g_mirror_ctl.c	optional geom_mirror
+geom/nop/g_nop.c		optional geom_nop
+geom/raid3/g_raid3.c		optional geom_raid3
+geom/raid3/g_raid3_ctl.c	optional geom_raid3
+geom/stripe/g_stripe.c		optional geom_stripe
+geom/uzip/g_uzip.c		optional geom_uzip
 gnu/ext2fs/ext2_alloc.c		optional ext2fs \
 	warning "kernel contains GPL contaminated ext2fs filesystem"
 gnu/ext2fs/ext2_balloc.c	optional ext2fs
@@ -1044,6 +1070,9 @@ isofs/cd9660/cd9660_util.c	optional cd9660
 isofs/cd9660/cd9660_vfsops.c	optional cd9660
 isofs/cd9660/cd9660_vnops.c	optional cd9660
 isofs/cd9660/cd9660_iconv.c	optional cd9660_iconv
+kern/bus_if.m			standard
+kern/clock_if.m			optional genclock
+kern/device_if.m		standard
 kern/imgact_elf.c		standard
 kern/imgact_shell.c		standard
 kern/inflate.c			optional gzip
@@ -1057,7 +1086,6 @@ kern/kern_condvar.c		standard
 kern/kern_conf.c		standard
 kern/kern_context.c		standard
 kern/kern_descrip.c		standard
-kern/kern_poll.c		optional device_polling
 kern/kern_environment.c		standard
 kern/kern_event.c		standard
 kern/kern_exec.c		standard
@@ -1078,10 +1106,11 @@ kern/kern_malloc.c		standard
 kern/kern_mbuf.c		standard
 kern/kern_mib.c			standard
 kern/kern_module.c		standard
-kern/kern_mutex.c		standard
 kern/kern_mtxpool.c		standard
+kern/kern_mutex.c		standard
 kern/kern_ntptime.c		standard
 kern/kern_physio.c		standard
+kern/kern_poll.c		optional device_polling
 kern/kern_proc.c		standard
 kern/kern_prot.c		standard
 kern/kern_resource.c		standard
@@ -1102,6 +1131,7 @@ kern/kern_umtx.c		standard
 kern/kern_uuid.c		standard
 kern/kern_xxx.c			standard
 kern/link_elf.c			standard
+kern/linker_if.m		standard
 kern/md4c.c			optional netsmb
 kern/md5c.c			standard
 kern/sched_4bsd.c		optional sched_4bsd
@@ -1158,6 +1188,7 @@ kern/uipc_domain.c		standard
 kern/uipc_mbuf.c		standard
 kern/uipc_mbuf2.c		standard
 kern/uipc_proto.c		standard
+kern/uipc_sem.c			optional p1003_1b_semaphores
 kern/uipc_socket.c		standard
 kern/uipc_socket2.c		standard
 kern/uipc_syscalls.c		standard
@@ -1185,6 +1216,7 @@ libkern/arc4random.c		standard
 libkern/bcd.c			standard
 libkern/bsearch.c		standard
 libkern/crc32.c			standard
+libkern/fnmatch.c		standard
 libkern/iconv.c			optional libiconv
 libkern/iconv_converter_if.m	optional libiconv
 libkern/iconv_xlat.c		optional libiconv
@@ -1194,7 +1226,6 @@ libkern/inet_ntoa.c		standard
 libkern/mcount.c		optional profiling-routine
 libkern/qsort.c			standard
 libkern/qsort_r.c		standard
-libkern/fnmatch.c		standard
 libkern/random.c		standard
 libkern/rindex.c		standard
 libkern/scanc.c			standard
@@ -1216,6 +1247,7 @@ libkern/strtouq.c		standard
 libkern/strvalid.c		standard
 net/bpf.c			standard
 net/bpf_filter.c		optional bpf
+net/bpf_filter.c		optional netgraph_bpf
 net/bridge.c			optional bridge
 net/bsd_comp.c			optional ppp_bsdcomp
 net/if.c			standard
@@ -1254,6 +1286,7 @@ net/raw_cb.c			standard
 net/raw_usrreq.c		standard
 net/route.c			standard
 net/rtsock.c			standard
+net/slcompress.c		optional netgraph_vjc
 net/slcompress.c		optional ppp
 net/slcompress.c		optional sl
 net/slcompress.c		optional sppp
@@ -1262,10 +1295,9 @@ net/zlib.c			optional ipsec
 net/zlib.c			optional crypto
 net/zlib.c			optional geom_uzip
 net80211/ieee80211.c		optional wlan
+net80211/ieee80211_acl.c	optional wlan_acl
 net80211/ieee80211_crypto.c	optional wlan
 net80211/ieee80211_crypto_ccmp.c optional wlan_ccmp
-crypto/rijndael/rijndael-alg-fst.c optional wlan_ccmp
-crypto/rijndael/rijndael-api.c	optional wlan_ccmp
 net80211/ieee80211_crypto_none.c optional wlan
 net80211/ieee80211_crypto_tkip.c optional wlan_tkip
 net80211/ieee80211_crypto_wep.c	optional wlan_wep
@@ -1276,7 +1308,6 @@ net80211/ieee80211_node.c	optional wlan
 net80211/ieee80211_output.c	optional wlan
 net80211/ieee80211_proto.c	optional wlan
 net80211/ieee80211_xauth.c	optional wlan_xauth
-net80211/ieee80211_acl.c	optional wlan_acl
 netatalk/aarp.c			optional netatalk
 netatalk/at_control.c		optional netatalk
 netatalk/at_proto.c		optional netatalk
@@ -1367,34 +1398,12 @@ netatm/uni/unisig_util.c	optional atm_uni atm_core
 netatm/uni/unisig_vc_state.c	optional atm_uni atm_core
 netgraph/atm/atmpif/ng_atmpif.c	optional netgraph_atm_atmpif
 netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
-netgraph/atm/ngatmbase.c		optional ngatm_atmbase
-contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase
-contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase
-netgraph/atm/ng_atm.c		optional ngatm_atm
 netgraph/atm/ccatm/ng_ccatm.c	optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm
+netgraph/atm/ng_atm.c		optional ngatm_atm
+netgraph/atm/ngatmbase.c		optional ngatm_atmbase
 netgraph/atm/sscfu/ng_sscfu.c	optional ngatm_sscfu
-contrib/ngatm/netnatm/saal/saal_sscfu.c	optional ngatm_sscfu
 netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop
-contrib/ngatm/netnatm/saal/saal_sscop.c	optional ngatm_sscop
 netgraph/atm/uni/ng_uni.c	optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni
 netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth
 netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c
 netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4
@@ -1416,12 +1425,13 @@ netgraph/bluetooth/socket/ng_btsocket_hci_raw.c	optional netgraph_bluetooth_sock
 netgraph/bluetooth/socket/ng_btsocket_l2cap.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_rfcomm.c optional netgraph_bluetooth_socket
+netgraph/netflow/netflow.c	optional netgraph_netflow
+netgraph/netflow/ng_netflow.c	optional netgraph_netflow
 netgraph/ng_UI.c		optional netgraph_UI
 netgraph/ng_async.c		optional netgraph_async
 netgraph/ng_atmllc.c		optional netgraph_atmllc
 netgraph/ng_base.c		optional netgraph
 netgraph/ng_bpf.c		optional netgraph_bpf
-net/bpf_filter.c		optional netgraph_bpf
 netgraph/ng_bridge.c		optional netgraph_bridge
 netgraph/ng_cisco.c		optional netgraph_cisco
 netgraph/ng_device.c		optional netgraph_device
@@ -1436,14 +1446,10 @@ netgraph/ng_hole.c		optional netgraph_hole
 netgraph/ng_iface.c		optional netgraph_iface
 netgraph/ng_ip_input.c		optional netgraph_ip_input
 netgraph/ng_ksocket.c		optional netgraph_ksocket
-netgraph/ng_lmi.c		optional netgraph_lmi
 netgraph/ng_l2tp.c		optional netgraph_l2tp
+netgraph/ng_lmi.c		optional netgraph_lmi
 netgraph/ng_mppc.c		optional netgraph_mppc_compression
 netgraph/ng_mppc.c		optional netgraph_mppc_encryption
-netgraph/netflow/ng_netflow.c	optional netgraph_netflow
-netgraph/netflow/netflow.c	optional netgraph_netflow
-crypto/rc4/rc4.c		optional netgraph_mppc_encryption
-crypto/sha1.c			optional netgraph_mppc_encryption
 netgraph/ng_one2many.c		optional netgraph_one2many
 netgraph/ng_parse.c		optional netgraph
 netgraph/ng_ppp.c		optional netgraph_ppp
@@ -1456,7 +1462,6 @@ netgraph/ng_sppp.c		optional netgraph_sppp
 netgraph/ng_tee.c		optional netgraph_tee
 netgraph/ng_tty.c		optional netgraph_tty
 netgraph/ng_vjc.c		optional netgraph_vjc
-net/slcompress.c		optional netgraph_vjc
 netinet/accf_data.c		optional accept_filter_data
 netinet/accf_http.c		optional accept_filter_http
 netinet/if_atm.c		optional atm
@@ -1581,6 +1586,14 @@ netsmb/smb_trantcp.c		optional netsmb
 netsmb/smb_usr.c		optional netsmb
 nfs/nfs_common.c		optional nfsclient
 nfs/nfs_common.c		optional nfsserver
+nfs4client/nfs4_dev.c		optional nfsclient
+nfs4client/nfs4_idmap.c		optional nfsclient
+nfs4client/nfs4_socket.c	optional nfsclient
+nfs4client/nfs4_subs.c		optional nfsclient
+nfs4client/nfs4_vfs_subs.c	optional nfsclient
+nfs4client/nfs4_vfsops.c	optional nfsclient
+nfs4client/nfs4_vn_subs.c	optional nfsclient
+nfs4client/nfs4_vnops.c		optional nfsclient
 nfsclient/bootp_subr.c		optional bootp nfsclient
 nfsclient/krpc_subr.c		optional bootp nfsclient
 nfsclient/nfs_bio.c		optional nfsclient
@@ -1592,15 +1605,6 @@ nfsclient/nfs_nfsiod.c		optional nfsclient
 nfsclient/nfs_vfsops.c		optional nfsclient
 nfsclient/nfs_vnops.c		optional nfsclient
 nfsclient/nfs_lock.c		optional nfsclient
-nfs4client/nfs4_socket.c	optional nfsclient
-nfs4client/nfs4_vfsops.c	optional nfsclient
-nfs4client/nfs4_vnops.c		optional nfsclient
-nfs4client/nfs4_subs.c		optional nfsclient
-nfs4client/nfs4_vfs_subs.c	optional nfsclient
-nfs4client/nfs4_vn_subs.c	optional nfsclient
-nfs4client/nfs4_dev.c		optional nfsclient
-nfs4client/nfs4_idmap.c		optional nfsclient
-rpc/rpcclnt.c			optional nfsclient
 nfsserver/nfs_serv.c		optional nfsserver
 nfsserver/nfs_srvsock.c		optional nfsserver
 nfsserver/nfs_srvcache.c	optional nfsserver
@@ -1613,15 +1617,11 @@ opencrypto/crypto.c		optional crypto
 opencrypto/cryptodev.c		optional cryptodev
 opencrypto/cryptosoft.c		optional crypto
 opencrypto/deflate.c		optional crypto
-opencrypto/rmd160.c		optional crypto
 opencrypto/rijndael.c		optional crypto
+opencrypto/rmd160.c		optional crypto
+opencrypto/rmd160.c		optional ipsec
 opencrypto/skipjack.c		optional crypto
 opencrypto/xform.c		optional crypto
-crypto/blowfish/bf_skey.c	optional crypto
-crypto/des/des_ecb.c		optional crypto
-crypto/des/des_setkey.c		optional crypto
-crypto/sha1.c			optional crypto
-crypto/sha2/sha2.c		optional crypto
 pci/agp.c			optional agp pci
 pci/agp_if.m			optional agp pci
 pci/alpm.c			optional alpm pci
@@ -1648,7 +1648,7 @@ pci/xrpu.c			optional xrpu pci
 posix4/ksched.c			optional _kposix_priority_scheduling
 posix4/p1003_1b.c		standard
 posix4/posix4_mib.c		standard
-kern/uipc_sem.c			optional p1003_1b_semaphores
+rpc/rpcclnt.c			optional nfsclient
 security/mac/mac_inet.c		optional mac inet
 security/mac/mac_label.c	optional mac
 security/mac/mac_net.c		optional mac
@@ -1696,6 +1696,9 @@ vm/default_pager.c		standard
 vm/device_pager.c		standard
 vm/phys_pager.c			standard
 vm/swap_pager.c			standard
+vm/uma_core.c			standard
+vm/uma_dbg.c			standard
+vm/vm_contig.c			standard
 vm/vm_fault.c			standard
 vm/vm_glue.c			standard
 vm/vm_init.c			standard
@@ -1705,12 +1708,9 @@ vm/vm_meter.c			standard
 vm/vm_mmap.c			standard
 vm/vm_object.c			standard
 vm/vm_page.c			standard
-vm/vm_pageq.c			standard
-vm/vm_contig.c			standard
-vm/vm_zeroidle.c		standard
 vm/vm_pageout.c			standard
+vm/vm_pageq.c			standard
 vm/vm_pager.c			standard
 vm/vm_unix.c			standard
-vm/uma_core.c			standard
-vm/uma_dbg.c			standard
+vm/vm_zeroidle.c		standard
 vm/vnode_pager.c		standard