From: jsg <jsg@openbsd.org>
Date: Wed, 14 Feb 2018 23:51:49 +0000 (+0000)
Subject: prune files.* entries that refer to files not in tree
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4d5fab15c3352c0df3c4c7158eddec500aa07e90;p=openbsd

prune files.* entries that refer to files not in tree
ok krw@ mpi@
---

diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index f6f455c854b..41998a2e3b4 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.106 2018/01/25 15:06:29 mpi Exp $
+#	$OpenBSD: files.alpha,v 1.107 2018/02/14 23:51:49 jsg Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -306,7 +306,6 @@ file	arch/alpha/alpha/promcons.c
 # XXX
 file	arch/alpha/alpha/cpuconf.c
 file	arch/alpha/alpha/dec_2100_a50.c		dec_2100_a50
-file	arch/alpha/alpha/dec_21000.c		dec_21000
 file	arch/alpha/alpha/dec_3000_300.c		dec_3000_300
 file	arch/alpha/alpha/dec_3000_500.c		dec_3000_500
 file	arch/alpha/alpha/dec_axppci_33.c	dec_axppci_33
diff --git a/sys/arch/armv7/omap/files.omap b/sys/arch/armv7/omap/files.omap
index b24d29fe11a..3a900b9e297 100644
--- a/sys/arch/armv7/omap/files.omap
+++ b/sys/arch/armv7/omap/files.omap
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.omap,v 1.21 2017/08/14 21:46:02 ians Exp $
+#	$OpenBSD: files.omap,v 1.22 2018/02/14 23:51:49 jsg Exp $
 
 define omap {}
 device omap: omap
@@ -77,10 +77,6 @@ device omusbtll
 attach omusbtll at omap
 file arch/armv7/omap/omusbtll.c			omusbtll
 
-device omkbd: wskbddev
-attach omkbd at omap
-file	arch/armv7/omap/omkbd.c			omkbd
-
 # LCD frame buffer
 device omdisplay: wsemuldisplaydev, rasops16
 attach omdisplay at omap
@@ -90,16 +86,6 @@ device amdisplay: wsemuldisplaydev, rasops16
 attach amdisplay at fdt
 file arch/armv7/omap/amdisplay.c		amdisplay
 
-# MCSPI - spi 
-device mcspi 
-attach mcspi at omap
-file	arch/armv7/omap/mcspi.c			mcspi
-
-# pseudo-Audio Device Driver
-device oaudio: audio
-attach oaudio at omap				# configure after Atlas Driver
-file arch/armv7/omap/beagle_audio.c		oaudio
-
 # TDA19988 HDMI PHY
 device nxphdmi
 attach nxphdmi at i2c
diff --git a/sys/arch/armv7/sunxi/files.sunxi b/sys/arch/armv7/sunxi/files.sunxi
index 2bb38520b62..db10fc4561f 100644
--- a/sys/arch/armv7/sunxi/files.sunxi
+++ b/sys/arch/armv7/sunxi/files.sunxi
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sunxi,v 1.19 2017/05/05 20:13:54 kettenis Exp $
+#	$OpenBSD: files.sunxi,v 1.20 2018/02/14 23:51:49 jsg Exp $
 
 device	sxiintc
 attach	sxiintc at fdt
@@ -16,9 +16,6 @@ device	sxiahci: scsi, atascsi
 attach	sxiahci at fdt
 file	arch/armv7/sunxi/sxiahci.c		sxiahci
 
-#attach ohci at sunxi with sxiohci
-#file	arch/armv7/sunxi/sxiohci.c		sxiohci
-
 device	sxie: ether, ifnet, mii, ifmedia
 attach	sxie at fdt
 file	arch/armv7/sunxi/sxie.c			sxie
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 1e76ff09e23..528e92cee5d 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.174 2017/08/28 19:32:53 jasper Exp $
+#	$OpenBSD: GENERIC,v 1.175 2018/02/14 23:51:49 jsg Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -184,9 +184,6 @@ sti1	at phantomas0 irq 12
 sti1	at uturn? irq 12
 sti*	at pci?			# EG-PCI, FX*
 
-#medusa* at mainbus? irq 4	# FDDI
-#venus* at mainbus? irq 5	# ATM J2498A/J3420A
-
 # internal i/o space
 gsc0	at asp?			# Snakes, old 715, old 725, 735/755
 gsc0	at lasi0		# 712,715/100,725/64,725/100,[ABCJ]*
@@ -226,7 +223,6 @@ ie0	at gsc0 irq 8		# 82C596DX/CA ether
 #ie*	at isa? port 0x360 iomem 0xd0000 irq 7
 #ie*	at isa? port 0x300 irq 10
 #ie*	at pci?
-#tms*	at gsc? irq 10		# TMS380C26 Network Controller
 #siop*	at gsc? irq 3		# NCR 53C720 (Fast-Wide HVD)
 osiop*	at gsc? irq 9		# NCR 53C710 (Narrow SE)
 #osiop* at eisa?
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index 5b76d566118..479897aa07e 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hppa,v 1.97 2017/06/05 18:59:07 deraadt Exp $
+#	$OpenBSD: files.hppa,v 1.98 2018/02/14 23:51:49 jsg Exp $
 #
 # hppa-specific configuration info
 
@@ -184,12 +184,6 @@ attach	elroy at gedoens
 file	arch/hppa/dev/elroy.c		elroy
 file	arch/hppa/dev/apic.c		elroy
 
-# EPIC, Excalibur PCI Interface Chip. Integrated IOA
-# SAGA is a 64-bit data path EPIC
-#device	epic: pcibus
-#attach	epic at gedoens
-#file	arch/hppa/dev/epic.c			epic
-
 attach	sti at gedoens with sti_gedoens
 file	arch/hppa/dev/sti_sgc.c			sti_gedoens
 file	arch/hppa/dev/sti_pci_machdep.c		sti_pci
@@ -260,23 +254,6 @@ device	harmony: audio
 attach	harmony at gsc
 file	arch/hppa/gsc/harmony.c			harmony
 
-# HPA4011A/B w/ TMS380C26PQL, TMS38054FNL
-#device	tms: tokenring
-#attach	tms at gsc
-#file	arch/hppa/gsc/if_tms.c			tms
-
-# these we don't know yet
-# AMD Supernet2 FDDI ?
-#device	medusa: fddi
-#attach	medusa at gsc
-#file	arch/hppa/gsc/medusa.c			medusa
-
-# XXX should not be here
-# ANSI/VITA 26-1998 Gbit packet switching network iface
-#device	myri: ether
-#attach	myri at pci
-#file	dev/pci/myri.c				myri
-
 # PS/2 input ports
 device	gsckbc: pckbcslot
 attach	gsckbc at gsc
diff --git a/sys/arch/landisk/conf/files.landisk b/sys/arch/landisk/conf/files.landisk
index ae5ea8bd539..3dc1bf245bb 100644
--- a/sys/arch/landisk/conf/files.landisk
+++ b/sys/arch/landisk/conf/files.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.landisk,v 1.13 2017/06/08 05:35:23 deraadt Exp $
+#	$OpenBSD: files.landisk,v 1.14 2018/02/14 23:51:49 jsg Exp $
 #	$NetBSD: files.landisk,v 1.2 2006/09/07 01:55:02 uwe Exp $
 
 # maxpartitions must be first item in files.${MACHINE}
@@ -96,7 +96,3 @@ file	arch/landisk/dev/wdc_obio.c	wdc_obio
 device	power
 attach	power at obio
 file	arch/landisk/dev/power.c	power needs-flag
-
-#device	led
-#attach	led at obio
-#file	arch/landisk/dev/led_obio.c	led needs-flag
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 6b4f992f413..d0bdc756d59 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.263 2017/11/27 09:03:37 mpi Exp $g
+#	$OpenBSD: GENERIC,v 1.264 2018/02/14 23:51:49 jsg Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -140,7 +140,6 @@ xlights*	at macobio?	# Xserve front panel LEDs
 mc*		at macobio?	# MACE ethernet
 #esp*		at macobio? flags 0x0000ffff # 53c9x SCSI
 mesh*		at macobio? flags 0xffff # MESH SCSI
-#nvram*		at macobio?	# nvram
 adb*		at macobio?	# Apple Desktop Bus
 apm0		at adb?		# APM emulation
 piic0		at adb?		# PMU I2C
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 739f49319ef..1fdcc4bdb7c 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.macppc,v 1.89 2017/10/11 17:25:23 deraadt Exp $
+#	$OpenBSD: files.macppc,v 1.90 2018/02/14 23:51:49 jsg Exp $
 
 #
 # macppc-specific configuration info
@@ -84,8 +84,6 @@ include "dev/wscons/files.wscons"
 # mac peripheral pieces.
 #
 
-#file	arch/macppc/pci/bandit.c			pci
-
 # HT bridge
 device  hpb {} : pcibus
 attach	hpb at pci
@@ -221,10 +219,6 @@ device	daca: audio, i2s
 attach	daca at macobio
 file	arch/macppc/dev/daca.c				daca
 
-#device	nvram
-#attach	nvram at macobio
-#file	arch/macppc/dev/nvram.c				nvram needs-flag
-
 device	macgpio {}
 attach	macgpio at macobio with macgpio
 attach	macgpio at macgpio with macgpio_gpio
diff --git a/sys/arch/sgi/conf/GENERIC-IP22 b/sys/arch/sgi/conf/GENERIC-IP22
index c50e81e3106..63f4eb42f7a 100644
--- a/sys/arch/sgi/conf/GENERIC-IP22
+++ b/sys/arch/sgi/conf/GENERIC-IP22
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP22,v 1.17 2015/11/02 20:14:35 miod Exp $
+#	$OpenBSD: GENERIC-IP22,v 1.18 2018/02/14 23:51:49 jsg Exp $
 #
 # THIS KERNEL IS FOR INDIGO (IP20), INDY (IP22) AND INDIGO2 (IP24) SYSTEMS ONLY.
 #
@@ -60,7 +60,6 @@ dpclock0	at hpc0		# IP20
 dsclock0	at hpc0		# IP22/24
 sq*		at hpc?		# On-board Ethernet or E++ adapter
 wdsc*		at hpc?		# On-board SCSI or GIO32 SCSI adapter
-#haltwo*		at hpc0		# Indy/Indigo2 Audio
 panel*		at hpc0		# Indy front panel buttons
 pckbc*		at hpc0		# Indy/Indigo2 keyboard and mouse
 
@@ -93,8 +92,6 @@ pci*		at giopci?
 #lxtphy*		at mii?		# Level1 LXT970 PHYs
 #ukphy*		at mii?		# "unknown" PHYs
 
-#audio*		at haltwo?
-
 scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
diff --git a/sys/arch/sgi/conf/GENERIC-IP26 b/sys/arch/sgi/conf/GENERIC-IP26
index a4ad14deb96..616f6b9bde4 100644
--- a/sys/arch/sgi/conf/GENERIC-IP26
+++ b/sys/arch/sgi/conf/GENERIC-IP26
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP26,v 1.3 2015/11/02 20:14:36 miod Exp $
+#	$OpenBSD: GENERIC-IP26,v 1.4 2018/02/14 23:51:49 jsg Exp $
 #
 # THIS KERNEL IS FOR POWER INDIGO2 R8000 (IP26) SYSTEMS ONLY.
 #
@@ -49,7 +49,6 @@ hpc0		at gio? addr 0x1fb80000
 dsclock0	at hpc0
 sq*		at hpc?		# On-board Ethernet
 wdsc*		at hpc?		# On-board SCSI
-#haltwo*		at hpc0		# Audio
 panel*		at hpc0		# front panel buttons
 pckbc*		at hpc0		# keyboard and mouse
 
@@ -75,8 +74,6 @@ pci*		at giopci?
 #lxtphy*		at mii?		# Level1 LXT970 PHYs
 #ukphy*		at mii?		# "unknown" PHYs
 
-#audio*		at haltwo?
-
 scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
diff --git a/sys/arch/sgi/conf/GENERIC-IP28 b/sys/arch/sgi/conf/GENERIC-IP28
index 6a286871faa..9918a08414c 100644
--- a/sys/arch/sgi/conf/GENERIC-IP28
+++ b/sys/arch/sgi/conf/GENERIC-IP28
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC-IP28,v 1.5 2015/11/02 20:14:36 miod Exp $
+#	$OpenBSD: GENERIC-IP28,v 1.6 2018/02/14 23:51:49 jsg Exp $
 #
 # THIS KERNEL IS FOR POWER INDIGO2 R10000 (IP28) SYSTEMS ONLY.
 #
@@ -48,7 +48,6 @@ hpc0		at gio? addr 0x1fb80000
 dsclock0	at hpc0
 sq*		at hpc?		# On-board Ethernet
 wdsc*		at hpc?		# On-board SCSI
-#haltwo*		at hpc0		# Audio
 panel*		at hpc0		# front panel buttons
 pckbc*		at hpc0		# keyboard and mouse
 
@@ -74,8 +73,6 @@ pci*		at giopci?
 #lxtphy*		at mii?		# Level1 LXT970 PHYs
 #ukphy*		at mii?		# "unknown" PHYs
 
-#audio*		at haltwo?
-
 scsibus*	at scsi?
 sd*		at scsibus?
 st*		at scsibus?
diff --git a/sys/arch/sgi/hpc/files.hpc b/sys/arch/sgi/hpc/files.hpc
index 8bee3cac6fa..9f6f9994ddd 100644
--- a/sys/arch/sgi/hpc/files.hpc
+++ b/sys/arch/sgi/hpc/files.hpc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.hpc,v 1.6 2015/05/11 06:46:21 ratchov Exp $
+# $OpenBSD: files.hpc,v 1.7 2018/02/14 23:51:49 jsg Exp $
 # $NetBSD: files.hpc,v 1.14 2009/05/14 01:10:19 macallan Exp $
 
 # IP20 RTC
@@ -22,10 +22,6 @@ device	wdsc: wd33c93ctrl, scsi, hpcdma
 attach	wdsc at hpc
 file	arch/sgi/hpc/wdsc.c			wdsc
 
-device	haltwo: audio
-attach	haltwo at hpc
-file	arch/sgi/hpc/haltwo.c			haltwo
-
 device	zs {[channel = -1]}
 attach	zs at hpc with zs_hpc
 file 	arch/sgi/hpc/zs.c			zs needs-flag
@@ -47,10 +43,6 @@ file	arch/sgi/hpc/z8530ms.c			zsms
 attach	pckbc at hpc with pckbc_hpc
 file	arch/sgi/hpc/pckbc_hpc.c		pckbc_hpc
 
-#device	pione
-#attach	pione at hpc
-#file	arch/sgi/hpc/pione.c			pione
-
 device	panel
 attach	panel at hpc
 file	arch/sgi/hpc/panel.c			panel
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index e97e89aa7a9..4046fc04b96 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc64,v 1.149 2017/10/17 14:25:35 visa Exp $
+#	$OpenBSD: files.sparc64,v 1.150 2018/02/14 23:51:49 jsg Exp $
 #	$NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
 
 # maxpartitions must be first item in files.${ARCH}
@@ -323,7 +323,6 @@ file	arch/sparc64/sparc64/in_cksum.S
 file	arch/sparc64/sparc64/in4_cksum.c
 file	arch/sparc64/sparc64/intr.c
 file	arch/sparc64/sparc64/ipifuncs.c		multiprocessor
-file	arch/sparc64/sparc64/kgdb_machdep.c	kgdb
 # sparc64/sparc64/locore.s is handled specially in the makefile,
 # because it must come first in the "ld" command line.
 file	arch/sparc64/sparc64/machdep.c
diff --git a/sys/conf/files b/sys/conf/files
index 4c66fca2802..559f62a9ff4 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.659 2018/02/14 08:55:35 mpi Exp $
+#	$OpenBSD: files,v 1.660 2018/02/14 23:51:49 jsg Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -65,7 +65,6 @@ define	wlan
 # "Chipset" attributes.  These are the machine-independent portions
 # of device drivers.
 define	ncr5380sbc	# NCR 5380 SCSI Bus Controller
-define	ncr53c7xx	# NCR 53c7xx SCSI Bus Controller
 define	dp8390nic	# 8390-family Ethernet controllers
 define	rtl80x9		# Realtek 8019/8029 NE2000-compatible
 define	dl10019		# DL10019/10022-family Ethernet controllers
@@ -630,7 +629,6 @@ file dev/diskmap.c
 file dev/firmload.c			firmload
 file dev/flash.c			flash			needs-flag
 file dev/ic/ncr5380sbc.c		ncr5380sbc
-file dev/ic/ncr53c7xx.c			ncr53c7xx
 file dev/ic/dp8390.c			dp8390nic
 file dev/ic/rtl80x9.c			rtl80x9
 file dev/ic/tea5757.c			tea5757
diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus
index 48302da6b20..551b921b57e 100644
--- a/sys/dev/cardbus/files.cardbus
+++ b/sys/dev/cardbus/files.cardbus
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.cardbus,v 1.30 2014/11/24 02:03:37 brad Exp $
+#	$OpenBSD: files.cardbus,v 1.31 2018/02/14 23:51:49 jsg Exp $
 #	$NetBSD: files.cardbus,v 1.8 2000/01/26 06:37:24 thorpej Exp $
 #
 # files.cardbus
@@ -106,12 +106,6 @@ file	dev/cardbus/ehci_cardbus.c		ehci_cardbus
 attach	ohci at cardbus with ohci_cardbus
 file	dev/cardbus/ohci_cardbus.c		ohci_cardbus
 
-#
-# Adaptec ADP-1480 SCSI controller
-#
-#attach	ahc at cardbus with ahc_cardbus: ahc_seeprom, smc93cx6
-#file	dev/cardbus/ahc_cardbus.c		ahc_cardbus
-
 #
 # UHCI USB controller
 #
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 22734ed33d6..65877402ccf 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.123 2016/09/04 10:35:39 tedu Exp $
+#	$OpenBSD: files.isa,v 1.124 2018/02/14 23:51:49 jsg 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.
@@ -168,12 +168,6 @@ file	dev/isa/if_ep_isa.c		ep_isa
 attach	ie at isa with ie_isa: elink
 file	dev/isa/if_ie.c			ie_isa
 
-# Intel i82595-based boards.
-# (Intel EtherExpress PRO/100)
-device	iy: ether, ifnet
-attach	iy at isa
-file	dev/isa/if_iy.c			iy
-
 # Intel EtherExpress PRO/10
 device	ex: ether, ifnet
 attach	ex at isa
@@ -214,13 +208,6 @@ file	dev/isa/sb.c			sb
 attach	sb at isa with sb_isa
 file	dev/isa/sb_isa.c		sb & (sb_isa | sb_isapnp)
 
-# Soundcards based on Sierra's Aria chipset.
-# Such as the Prometheus Aria 16 or the Diamond
-# sonic sound.
-device	aria: audio
-attach	aria at isa
-file	dev/isa/aria.c			aria
-
 # ProAudio Spectrum
 device	pas: audio, isa_dma, sbdsp
 attach	pas at isa
@@ -320,14 +307,3 @@ file	dev/isa/asmc.c			asmc
 device	isagpio: gpiobus
 attach	isagpio at isa
 file	dev/isa/isagpio.c		isagpio
-
-#
-# 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
-
-#file	dev/isa/pcmcia_isa.c		pcmcia
diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia
index ec65e7a64af..cc673cce63e 100644
--- a/sys/dev/pcmcia/files.pcmcia
+++ b/sys/dev/pcmcia/files.pcmcia
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pcmcia,v 1.46 2016/09/03 16:18:21 tedu Exp $
+#	$OpenBSD: files.pcmcia,v 1.47 2018/02/14 23:51:49 jsg 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.
@@ -41,25 +41,11 @@ file	dev/pcmcia/wdc_pcmcia.c			wdc_pcmcia
 attach	sm at pcmcia with sm_pcmcia
 file	dev/pcmcia/if_sm_pcmcia.c		sm_pcmcia
 
-# MB8696x Ethernet Controllers (i.e. TDK LAK CD021BX)
-#attach	mbe at pcmcia with mbe_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
 
-# PCMCIA Floppy controller
-#attach	fdc at pcmcia with fdc_pcmcia
-#file	dev/pcmcia/fdc_pcmcia.c			fdc_pcmcia
-
-# PCMCIA multi-port serial cards
-#device	pcmcom {[slave = -1]}
-#attach	pcmcom at pcmcia
-#attach	com at pcmcom with com_pcmcom
-#file	dev/pcmcia/pcmcom.c			pcmcom | com_pcmcom needs-flag
-
 # Lucent WaveLAN
 attach	wi at pcmcia with wi_pcmcia
 file	dev/pcmcia/if_wi_pcmcia.c		wi_pcmcia
diff --git a/sys/dev/sbus/files.sbus b/sys/dev/sbus/files.sbus
index c73aa8b292d..45637aa1d89 100644
--- a/sys/dev/sbus/files.sbus
+++ b/sys/dev/sbus/files.sbus
@@ -1,11 +1,10 @@
-#	$OpenBSD: files.sbus,v 1.43 2015/06/19 11:12:24 jmatthew Exp $
+#	$OpenBSD: files.sbus,v 1.44 2018/02/14 23:51:49 jsg 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
 
 # SBus NCR539x SCSI & Lance Ethernet
 device	dma {}: lsi64854
diff --git a/sys/dev/tc/files.tc b/sys/dev/tc/files.tc
index aa4430d2263..dad18012e15 100644
--- a/sys/dev/tc/files.tc
+++ b/sys/dev/tc/files.tc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.tc,v 1.14 2017/11/02 14:04:24 mpi Exp $
+#	$OpenBSD: files.tc,v 1.15 2018/02/14 23:51:49 jsg Exp $
 #	$NetBSD: files.tc,v 1.26 2001/11/28 10:21:24 lukem Exp $
 #
 # Config file and device description for machine-independent
@@ -50,9 +50,3 @@ file	dev/ic/z8530sc.c		zs
 device	zstty: tty
 attach	zstty at zs
 file	dev/ic/z8530tty.c		zstty		needs-flag
-
-#attach	vsms at zs with zsms
-#file	dev/tc/zsms.c			zsms
-
-#attach	lkkbd at zs with zskbd
-#file	dev/tc/zskbd.c			zskbd		needs-flag