Regen after switch(4) removal

14 files changed, 155 insertions, 231 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index d3795da3572..712cc27b22d 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.77 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.78 2021/11/11 09:47:32 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -90,7 +90,6 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -252,10 +251,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 69 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 61 $U 600
 	;;
@@ -544,17 +539,17 @@ local)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
-	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 ttyB0 ttyB1 tap0
-	R tap1 tap2 tap3 tun0 tun1 tun2 tun3 pty0 fd1 fd1B fd1C fd1D
-	R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
-	R diskmap vscsi0 ch0 bio audio0 audio1 audio2 audio3 kstat dt
-	R bpf fuse pppac pppx hotplug ptm local wscons pci0 pci1 pci2
-	R pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
-	R rmidi7 tuner0 radio0 speaker video0 video1 uk0 random lpa0
-	R lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05
-	R tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3
-	R ttyc4 ttyc5 ttyc6 ttyc7 pf wd0 wd1 wd2 wd3 std st0 st1 fd
+	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
+	R cd0 cd1 rd0 ttyB0 ttyB1 tap0 tap1 tap2 tap3 tun0 tun1 tun2
+	R tun3 pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B
+	R fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 bio audio0
+	R audio1 audio2 audio3 kstat dt bpf fuse pppac pppx hotplug
+	R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1
+	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0
+	R speaker video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1
+	R lpt2 tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
+	R tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+	R ttyc7 pf wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 56caf1b2d13..b03ef351d21 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.78 2021/02/12 10:26:33 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.79 2021/11/11 09:47:32 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -100,7 +100,6 @@
 #	vmm	Virtual Machine Monitor
 #	vscsi*	Virtual SCSI controller
 #	pvbus*	paravirtual device tree root
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -257,10 +256,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 97 $U 600
-	;;
-
 pvbus*)
 	M pvbus$U c 95 $U 640
 	;;
@@ -605,20 +600,19 @@ local)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 ipmi0 ttyVI00 ttyVI10
-	R ttyVI20 ttyVI30 ttyVI40 drm0 drm1 drm2 drm3 dri nvram gpio0
-	R gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
-	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0
-	R tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G
-	R fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0
-	R ch0 audio0 audio1 audio2 audio3 kstat dt kcov bpf pvbus0
-	R pvbus1 vmm fuse pppac pppx hotplug ptm local wscons pci0
-	R pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
-	R rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0 video1 uk0
-	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03
-	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1
-	R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr wd0 wd1 wd2
-	R wd3 std st0 st1 fd
+	R ipmi0 ttyVI00 ttyVI10 ttyVI20 ttyVI30 ttyVI40 drm0 drm1
+	R drm2 drm3 dri nvram gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2
+	R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0
+	R tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 fd1 fd1B
+	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
+	R fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 audio3
+	R kstat dt kcov bpf pvbus0 pvbus1 vmm fuse pppac pppx hotplug
+	R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1
+	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0
+	R speaker video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1
+	R lpt2 tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
+	R tty09 tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+	R ttyc7 apm pf pctr wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.arm64/MAKEDEV b/etc/etc.arm64/MAKEDEV
index e0d6b99712d..d1a551db8ef 100644
--- a/etc/etc.arm64/MAKEDEV
+++ b/etc/etc.arm64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.arm64/MAKEDEV.md,v 1.12 2021/02/12 10:26:34 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.arm64/MAKEDEV.md,v 1.13 2021/11/11 09:47:32 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -88,7 +88,6 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -241,10 +240,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 97 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 89 $U 600
 	;;
@@ -514,16 +509,15 @@ local)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 ipmi0 drm0 drm1 drm2 drm3
-	R dri gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2
-	R sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3
-	R tun0 tun1 tun2 tun3 bio pty0 diskmap vscsi0 ch0 audio0
-	R audio1 audio2 audio3 kstat dt bpf fuse pppac pppx hotplug
-	R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1
-	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0
-	R video0 video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05
-	R tty06 tty07 tty08 tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3
-	R std fd
+	R ipmi0 drm0 drm1 drm2 drm3 dri gpio0 gpio1 gpio2 bktr0 vnd0
+	R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0
+	R cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
+	R diskmap vscsi0 ch0 audio0 audio1 audio2 audio3 kstat dt bpf
+	R fuse pppac pppx hotplug ptm local wscons pci0 pci1 pci2 pci3
+	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R tuner0 radio0 video0 video1 uk0 random tty00 tty01 tty02
+	R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf
+	R wd0 wd1 wd2 wd3 std fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.armv7/MAKEDEV b/etc/etc.armv7/MAKEDEV
index 0a13248d3ae..bf531c59d9e 100644
--- a/etc/etc.armv7/MAKEDEV
+++ b/etc/etc.armv7/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.armv7/MAKEDEV.md,v 1.20 2021/05/24 21:06:52 phessler Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.armv7/MAKEDEV.md,v 1.21 2021/11/11 09:47:32 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -84,7 +84,6 @@
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -236,10 +235,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 105 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 100 $U 600
 	;;
@@ -495,15 +490,15 @@ local)
 	;;
 
 all)
-	R gpio0 gpio1 gpio2 gpio3 gpio4 gpio5 gpio6 gpio7 gpio8
-	R switch0 switch1 switch2 switch3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
-	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2
-	R tap3 tun0 tun1 tun2 tun3 bio pty0 diskmap vscsi0 ch0 audio0
-	R audio1 audio2 kstat dt bpf fuse pppac pppx hotplug ptm local
-	R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3
-	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0
-	R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
-	R tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 st1 fd
+	R gpio0 gpio1 gpio2 gpio3 gpio4 gpio5 gpio6 gpio7 gpio8 vnd0
+	R vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0
+	R cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
+	R diskmap vscsi0 ch0 audio0 audio1 audio2 kstat dt bpf fuse
+	R pppac pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R tuner0 radio0 video0 video1 uk0 random tty00 tty01 tty02
+	R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf
+	R wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 5bdb46e946d..2feae686d55 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.67 2021/04/02 02:29:54 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.68 2021/11/11 09:47:33 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -83,7 +83,6 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -235,10 +234,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 60 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 54 $U 600
 	;;
@@ -506,15 +501,15 @@ local)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
-	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2
-	R tap3 tun0 tun1 tun2 tun3 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
-	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap
-	R vscsi0 bio ch0 audio0 audio1 audio2 audio3 kstat dt bpf fuse
-	R pppac pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
-	R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00
-	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
-	R tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd
+	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 pty0 fd1
+	R fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E
+	R fd0F fd0G fd0H diskmap vscsi0 bio ch0 audio0 audio1 audio2
+	R audio3 kstat dt bpf fuse pppac pppx hotplug ptm local wscons
+	R pci0 pci1 pci2 pci3 uall video0 video1 uk0 random lpa0 lpa1
+	R lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05
+	R tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 std
+	R st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 0bd74179e0b..cce9b051813 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.93 2021/02/12 10:26:34 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.94 2021/11/11 09:47:33 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -100,7 +100,6 @@
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
 #	pvbus*	paravirtual device tree root
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -257,10 +256,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 97 $U 600
-	;;
-
 pvbus*)
 	M pvbus$U c 95 $U 640
 	;;
@@ -605,19 +600,19 @@ local)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 ipmi0 amdmsr drm0 drm1 drm2
-	R drm3 dri nvram gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3
-	R sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0
-	R tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C
-	R fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G
-	R fd0H diskmap vscsi0 ch0 audio0 audio1 audio2 audio3 kstat dt
-	R kcov bpf pvbus0 pvbus1 fuse pppac pppx hotplug ptm local
-	R wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3
-	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 speaker video0
-	R video1 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2
-	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
-	R tty0a tty0b ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
-	R apm pf pctr wd0 wd1 wd2 wd3 std st0 st1 fd
+	R ipmi0 amdmsr drm0 drm1 drm2 drm3 dri nvram gpio0 gpio1
+	R gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6
+	R sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2
+	R tun3 bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0
+	R fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0
+	R audio1 audio2 audio3 kstat dt kcov bpf pvbus0 pvbus1 fuse
+	R pppac pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R tuner0 radio0 speaker video0 video1 uk0 random joy0 joy1
+	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04
+	R tty05 tty06 tty07 tty08 tty09 tty0a tty0b ttyc0 ttyc1 ttyc2
+	R ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm pf pctr wd0 wd1 wd2 wd3
+	R std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index 09470b84201..b2f54b7aef9 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.49 2021/01/23 05:08:33 thfr Exp 
-#	OpenBSD: MAKEDEV.common,v 1.112 2021/01/23 05:08:33 thfr Exp 
+#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.50 2021/11/11 09:47:33 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -80,7 +80,6 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -231,10 +230,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 105 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 99 $U 600
 	;;
@@ -470,13 +465,13 @@ local)
 	;;
 
 all)
-	R vnd0 vnd1 vnd2 vnd3 switch0 switch1 switch2 switch3 sd0 sd1
-	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2
-	R tap3 tun0 tun1 tun2 tun3 bio pty0 diskmap vscsi0 ch0 ttya
-	R audio0 audio1 audio2 audio3 kstat dt bpf fuse pppac pppx
-	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0
-	R video0 video1 uk0 random pf wd0 wd1 wd2 wd3 std st0 st1 fd
+	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
+	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
+	R diskmap vscsi0 ch0 ttya audio0 audio1 audio2 audio3 kstat dt
+	R bpf fuse pppac pppx hotplug ptm local wscons pci0 pci1 pci2
+	R pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+	R rmidi7 radio0 video0 video1 uk0 random pf wd0 wd1 wd2 wd3
+	R std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index 606087e4e80..5a8e9181593 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.35 2021/04/02 02:29:56 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.36 2021/11/11 09:47:33 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -82,7 +82,6 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -228,10 +227,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 75 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 69 $U 600
 	;;
@@ -490,14 +485,13 @@ ramdisk)
 	;;
 
 all)
-	R drm0 drm1 drm2 drm3 dri switch0 switch1 switch2 switch3
-	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
-	R pty1 pty2 diskmap vscsi0 audio0 audio1 audio2 audio3 kstat
-	R dt bpf fuse pppac pppx hotplug ptm local wscons pci0 pci1
-	R pci2 pci3 uall video0 video1 uk0 random tty00 tty01 tty02
-	R tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf
-	R wd0 wd1 wd2 wd3 std st0 st1 fd
+	R drm0 drm1 drm2 drm3 dri vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
+	R sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0
+	R tun1 tun2 tun3 bio pty0 pty1 pty2 diskmap vscsi0 audio0
+	R audio1 audio2 audio3 kstat dt bpf fuse pppac pppx hotplug
+	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 uk0
+	R random tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
+	R tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index d06fad82e68..28e08e707e9 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.36 2021/04/02 02:29:56 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.37 2021/11/11 09:47:33 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -70,7 +70,6 @@
 #	tap*	Ethernet tunnel driver
 #	uk*	Unknown SCSI devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	xp	HD647180 I/O processor
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -222,10 +221,6 @@ xp)
 		M xp c 11 0 600 
 	;;
 
-switch*)
-	M switch$U c 57 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 53 $U 600
 	;;
@@ -413,12 +408,12 @@ ramdisk)
 	;;
 
 all)
-	R xp pcex audio0 lcd ttya switch0 switch1 switch2 switch3
-	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tap0
-	R tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 diskmap vscsi0
-	R ch0 kstat dt bpf fuse pppac pppx ptm local wscons uk0 random
-	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
-	R tty0a tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd
+	R xp pcex audio0 lcd ttya vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3
+	R sd4 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio
+	R pty0 diskmap vscsi0 ch0 kstat dt bpf fuse pppac pppx ptm
+	R local wscons uk0 random tty00 tty01 tty02 tty03 tty04 tty05
+	R tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 std
+	R st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 8d81ccfeb95..10ddd508941 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.78 2021/04/02 02:29:56 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.79 2021/11/11 09:47:33 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -89,7 +89,6 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -238,10 +237,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 89 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 83 $U 600
 	;;
@@ -541,16 +536,15 @@ ramdisk)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 drm0 drm1 drm2 drm3 dri bio
-	R gpio0 gpio1 gpio2 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
-	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0
-	R tun1 tun2 tun3 pty0 diskmap vscsi0 ch0 cuaa cuab ttya ttyb
-	R audio0 audio1 audio2 audio3 kstat dt bpf fuse pppac pppx
-	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
-	R radio0 video0 video1 uk0 random tty00 tty01 tty02 tty03
-	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b apm pf wd0
-	R wd1 wd2 wd3 std st0 st1 fd
+	R drm0 drm1 drm2 drm3 dri bio gpio0 gpio1 gpio2 vnd0 vnd1
+	R vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1
+	R rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 pty0 diskmap
+	R vscsi0 ch0 cuaa cuab ttya ttyb audio0 audio1 audio2 audio3
+	R kstat dt bpf fuse pppac pppx hotplug ptm local wscons pci0
+	R pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
+	R rmidi5 rmidi6 rmidi7 tuner0 radio0 video0 video1 uk0 random
+	R tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09
+	R tty0a tty0b apm pf wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.octeon/MAKEDEV b/etc/etc.octeon/MAKEDEV
index 323d78cdd43..d2bebde2902 100644
--- a/etc/etc.octeon/MAKEDEV
+++ b/etc/etc.octeon/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.octeon/MAKEDEV.md,v 1.21 2021/04/02 02:29:56 deraadt Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.octeon/MAKEDEV.md,v 1.22 2021/11/11 09:47:33 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -78,7 +78,6 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -229,10 +228,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 75 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 69 $U 600
 	;;
@@ -454,14 +449,13 @@ ramdisk)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 octcf0 vnd0 vnd1 vnd2 vnd3
-	R sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0
-	R tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0 pty1 pty2
-	R diskmap vscsi0 ch0 audio0 audio1 audio2 audio3 kstat dt bpf
-	R fuse pppac pppx hotplug ptm local wscons pci0 pci1 pci2 pci3
-	R uall video0 video1 uk0 random tty00 tty01 tty02 tty03 tty04
-	R tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1 wd2 wd3
-	R std st0 st1 fd
+	R octcf0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7
+	R sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3
+	R bio pty0 pty1 pty2 diskmap vscsi0 ch0 audio0 audio1 audio2
+	R audio3 kstat dt bpf fuse pppac pppx hotplug ptm local wscons
+	R pci0 pci1 pci2 pci3 uall video0 video1 uk0 random tty00
+	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
+	R tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 octcf*|wd*|sd*)
diff --git a/etc/etc.powerpc64/MAKEDEV b/etc/etc.powerpc64/MAKEDEV
index dfc8a8acd23..3e966695ada 100644
--- a/etc/etc.powerpc64/MAKEDEV
+++ b/etc/etc.powerpc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.powerpc64/MAKEDEV.md,v 1.8 2021/02/12 10:26:34 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.powerpc64/MAKEDEV.md,v 1.10 2021/11/11 09:47:34 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -85,7 +85,6 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -242,10 +241,6 @@ kstat)
 	M kstat c 15 0 640
 	;;
 
-switch*)
-	M switch$U c 74 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 83 $U 600
 	;;
@@ -515,14 +510,14 @@ local)
 
 all)
 	R vscsi0 vnd0 vnd1 vnd2 vnd3 tun0 tun1 tun2 tun3 tap0 tap1
-	R tap2 tap3 switch0 switch1 switch2 switch3 sd0 sd1 sd2 sd3
-	R sd4 sd5 sd6 sd7 sd8 sd9 rd0 pty0 ipmi0 drm0 drm1 drm2 drm3
-	R dri diskmap cd0 cd1 bio audio0 audio1 audio2 audio3 kstat dt
-	R kcov bpf fuse pppac pppx hotplug ptm local wscons pci0 pci1
-	R pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 radio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1
-	R lpt2 tty00 tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08
-	R tty09 tty0a tty0b pf wd0 wd1 wd2 wd3 std st0 st1 fd
+	R tap2 tap3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 rd0 pty0
+	R ipmi0 drm0 drm1 drm2 drm3 dri diskmap cd0 cd1 bio audio0
+	R audio1 audio2 audio3 kstat dt kcov bpf fuse pppac pppx
+	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 uk0
+	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03
+	R tty04 tty05 tty06 tty07 tty08 tty09 tty0a tty0b pf wd0 wd1
+	R wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.riscv64/MAKEDEV b/etc/etc.riscv64/MAKEDEV
index 1e75d2fc4db..1980da3950e 100644
--- a/etc/etc.riscv64/MAKEDEV
+++ b/etc/etc.riscv64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.riscv64/MAKEDEV.md,v 1.2 2021/06/26 00:38:38 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.riscv64/MAKEDEV.md,v 1.4 2021/11/11 09:47:34 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -85,7 +85,6 @@
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -238,10 +237,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 97 $U 600
-	;;
-
 vscsi*)
 	M vscsi$U c 89 $U 600
 	;;
@@ -494,15 +489,15 @@ local)
 	;;
 
 all)
-	R switch0 switch1 switch2 switch3 ipmi0 gpio0 gpio1 gpio2
-	R bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7
-	R sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3
-	R bio pty0 dri diskmap vscsi0 ch0 audio0 audio1 audio2 audio3
-	R kstat dt bpf fuse pppac pppx hotplug ptm local wscons pci0
-	R pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
-	R rmidi5 rmidi6 rmidi7 radio0 video0 video1 uk0 random tty00
-	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
-	R tty0b apm pf wd0 wd1 wd2 wd3 std fd
+	R ipmi0 gpio0 gpio1 gpio2 bktr0 vnd0 vnd1 vnd2 vnd3 sd0 sd1
+	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2
+	R tap3 tun0 tun1 tun2 tun3 bio pty0 dri diskmap vscsi0 ch0
+	R audio0 audio1 audio2 audio3 kstat dt bpf fuse pppac pppx
+	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0
+	R video0 video1 uk0 random tty00 tty01 tty02 tty03 tty04 tty05
+	R tty06 tty07 tty08 tty09 tty0a tty0b apm pf wd0 wd1 wd2 wd3
+	R std fd
 	;;
 
 wd*|sd*)
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 79c2e41ab2b..15f816cf1bd 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.97 2021/02/12 10:26:34 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.113 2021/02/12 10:26:33 jsg Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.98 2021/11/11 09:47:34 claudio Exp 
+#	OpenBSD: MAKEDEV.common,v 1.114 2021/11/11 09:47:32 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.83 2016/09/11 03:06:31 deraadt Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -102,7 +102,6 @@
 #	spds	Service processor domain services channel
 #	ldom*	Logical domain services channels
 #	vdsp*	Virtual disk server ports
-#	switch*	Switch driver
 #	kstat	Kernel Statistics
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -257,10 +256,6 @@ kstat)
 	M kstat c 51 0 640
 	;;
 
-switch*)
-	M switch$U c 136 $U 600
-	;;
-
 vdsp*)
 	M vdsp$U c 133 $U 600
 	;;
@@ -666,17 +661,16 @@ all)
 	R ldom12 ldom13 ldom14 ldom15 spds hvctl ttyV0 ttyV1 ttyV2
 	R ttyV3 ttyV4 ttyV5 ttyV6 ttyV7 ttyV8 ttyV9 ttyVa ttyVb ttyVc
 	R ttyVd ttyVe ttyVf cuaa cuab cuac cuad ttya ttyb ttyc ttyd
-	R switch0 switch1 switch2 switch3 drm0 drm1 drm2 drm3 dri bpp0
-	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
-	R cd0 cd1 rd0 tap0 tap1 tap2 tap3 tun0 tun1 tun2 tun3 bio pty0
-	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
-	R fd0E fd0F fd0G fd0H diskmap vscsi0 ch0 audio0 audio1 audio2
-	R audio3 kstat dt bpf fuse pppac pppx hotplug ptm local wscons
-	R pci0 pci1 pci2 pci3 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
-	R rmidi5 rmidi6 rmidi7 video0 video1 uk0 random lpa0 lpa1 lpa2
-	R lpt0 lpt1 lpt2 tty00 tty01 tty02 tty03 tty04 tty05 tty06
-	R tty07 tty08 tty09 tty0a tty0b ttyh0 ttyh1 pf wd0 wd1 wd2 wd3
-	R std st0 st1 fd
+	R drm0 drm1 drm2 drm3 dri bpp0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2
+	R sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tap0 tap1 tap2 tap3
+	R tun0 tun1 tun2 tun3 bio pty0 fd1 fd1B fd1C fd1D fd1E fd1F
+	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap
+	R vscsi0 ch0 audio0 audio1 audio2 audio3 kstat dt bpf fuse
+	R pppac pppx hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R video0 video1 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 tty00
+	R tty01 tty02 tty03 tty04 tty05 tty06 tty07 tty08 tty09 tty0a
+	R tty0b ttyh0 ttyh1 pf wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*)