regen

14 files changed, 192 insertions, 143 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 2025fea7a43..66cfffe80ae 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.50 2010/09/30 15:27:54 claudio Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.51 2010/11/19 20:55:46 miod Exp 
 #	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -65,7 +65,9 @@
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
+#	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
+#	uscanner*	Scanners
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -372,11 +374,19 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+uscanner*)
+	M uscanner$U c 66 $U 660
+	;;
+
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 45 $U 660
 	;;
 
+urio*)
+	M urio$U c 65 $U 660
+	;;
+
 ulpt*)
 	M ulpt$U c 47 $U 660
 	;;
@@ -395,7 +405,8 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
-	R uhid2 uhid3 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R uhid2 uhid3 uscanner0 urio0 usb0 usb1 usb2 usb3 usb4 usb5
+	R usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 2a705d681da..96b5d3b56ad 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.41 2010/09/30 15:27:54 claudio Exp 
+#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.42 2010/11/19 20:55:48 miod Exp 
 #	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -63,6 +63,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
+#	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
@@ -320,6 +321,10 @@ lkm)
 	M lkm c 24 0 640 _lkm
 	;;
 
+hotplug)
+	M hotplug c 56 $U 400
+	;;
+
 fd)
 	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
 	while [ $n -lt 64 ];do M fd/$n c 21 $n;n=$(($n+1));done
@@ -460,8 +465,9 @@ all)
 	R ct0 ct1 hd0 hd1 hd2 dcm0 dcm1 dcm2 dcm3 dca0 dca1 ccd0 ccd1
 	R ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1
 	R rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5
-	R bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 ptm local
-	R ppi0 apci0 wscons uk0 random lkm pf systrace std st0 st1 fd
+	R bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 hotplug
+	R ptm local ppi0 apci0 wscons uk0 random lkm pf systrace std
+	R st0 st1 fd
 	;;
 
 sd*|hd*|ccd*)
diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index c96cfa1d4bc..d5bf84e9437 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.21 2010/09/30 15:27:54 claudio Exp 
+#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.22 2010/11/19 20:55:48 miod Exp 
 #	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -55,6 +55,15 @@
 #	wsmouse*	wscons mice
 # Printers:
 #	lpt*	IEEE 1284 centronics printer
+# USB devices:
+#	uall	All USB devices
+#	usb*	Bus control devices used by usbd for attach/detach
+#	uhid*	Generic HID devices
+#	ugen*	Generic USB devices
+#	ulpt*	Printer devices
+#	urio*	Diamond Multimedia Rio 500
+#	ttyU*	USB serial ports
+#	uscanner*	Scanners
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -220,7 +229,7 @@ std)
 	;;
 
 vscsi*)
-	M vscsi$U c 46 $U 600
+	M vscsi$U c 54 $U 600
 	;;
 
 video*)
@@ -250,7 +259,7 @@ systrace)
 	;;
 
 pppx*)
-	M pppx$U c 48 $U 600
+	M pppx$U c 57 $U 600
 	;;
 
 pf*)
@@ -277,7 +286,7 @@ fd)
 	;;
 
 diskmap)
-	M diskmap c 47 0 640 operator
+	M diskmap c 56 0 640 operator
 	;;
 
 crypto)
@@ -303,6 +312,48 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+uscanner*)
+	M uscanner$U c 46 $U 660
+	;;
+
+ttyU[0-9a-zA-Z])
+	U=${i#ttyU*}
+	o=$(alph2d $U)
+	M ttyU$U c 45 $o 660 dialer uucp
+	M cuaU$U c 45 $(($o+128)) 660 dialer uucp
+	;;
+
+urio*)
+	M urio$U c 44 $U 660
+	;;
+
+ulpt*)
+	M ulpt$U c 43 $U 660
+	;;
+
+ugen*)
+	n=$(($U*16))
+	for j in 0{0,1,2,3,4,5,6,7,8,9} 1{0,1,2,3,4,5}
+	do
+		M ugen$U.$j c 42 $(($n+10#$j)) 660
+	done
+	;;
+
+uhid*)
+	M uhid$U c 41 $U 660
+	;;
+
+usb*)
+	[ "$i" = "usb" ] && u= || u=$U
+	M usb$u c 40 $U 660
+	;;
+
+uall)
+	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
+	R uhid2 uhid3 uscanner0 urio0 usb0 usb1 usb2 usb3 usb4 usb5
+	R usb6 usb7
+	;;
+
 lpt*|lpa*)
 	case $i in
 	lpt*) n=lpt f=0;;
@@ -449,9 +500,9 @@ all)
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B
 	R fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F
 	R fd0G fd0H diskmap vscsi0 nnpfs0 ch0 ptm local wscons pci0
-	R pci1 pci2 pci3 video0 video1 audio0 audio1 audio2 uk0 random
-	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
-	R crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R pci1 pci2 pci3 uall video0 video1 audio0 audio1 audio2 uk0
+	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
+	R tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index 886b47a570b..397dc506ac2 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.9 2010/09/30 15:27:54 claudio Exp 
+#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.10 2010/11/19 20:55:48 miod Exp 
 #	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -60,6 +60,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
+#	uscanner*	Scanners
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -312,6 +313,10 @@ apm*)
 	M apmctl	c 14 8 644
 	;;
 
+uscanner*)
+	M uscanner$U c 72 $U 660
+	;;
+
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 61 $U 660
@@ -339,7 +344,8 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
-	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R uhid2 uhid3 uscanner0 urio0 usb0 usb1 usb2 usb3 usb4 usb5
+	R usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index 9c3ca428be8..55374b00afa 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.32 2010/09/30 15:27:54 claudio Exp 
+#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.33 2010/11/19 20:55:48 miod Exp 
 #	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -60,6 +60,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
+#	uscanner*	Scanners
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -301,6 +302,10 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+uscanner*)
+	M uscanner$U c 72 $U 660
+	;;
+
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 61 $U 660
@@ -328,7 +333,8 @@ ugen*)
 
 uall)
 	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
-	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	R uhid2 uhid3 uscanner0 urio0 usb0 usb1 usb2 usb3 usb4 usb5
+	R usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/etc/etc.socppc/MAKEDEV b/etc/etc.socppc/MAKEDEV
index 5d347b008ee..b92d3b14f2a 100644
--- a/etc/etc.socppc/MAKEDEV
+++ b/etc/etc.socppc/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.12 2010/09/30 15:27:54 claudio Exp 
+#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.13 2010/11/19 20:55:48 miod Exp 
 #	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -54,8 +54,8 @@
 # Pointing devices:
 #	wsmouse*	wscons mice
 # USB devices:
-#	ttyU*	USB serial ports
 #	uall	All USB devices
+#	ttyU*	USB serial ports
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -63,27 +63,18 @@
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
 # Special purpose devices:
-#	apm	Power management device
-#	audio*	Audio devices
-#	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	bthub*	Bluetooth Hubs
-#	crypto	Hardware crypto access driver
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	gpio*	General Purpose Input/Output
 #	hotplug	devices hot plugging
-#	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
-#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	pppx*	PPP Multiplexer
-#	radio*	FM tuner devices
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
-#	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
 #	vscsi*	Virtual SCSI controller
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
@@ -235,10 +226,6 @@ video*)
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
 	;;
 
-uk*)
-	M uk$U c 41 $U 640 operator
-	;;
-
 tun*)
 	M tun$U c 23 $U 600
 	;;
@@ -256,11 +243,6 @@ systrace)
 	done
 	;;
 
-radio*)
-	M radio$U     c 76 $U
-	MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
-	;;
-
 pppx*)
 	M pppx$U c 83 $U 600
 	;;
@@ -274,24 +256,12 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
 
-iop*)
-	M iop$U c 73 $U 660
-	;;
-
 hotplug)
-	M hotplug c 78 $U 400
-	;;
-
-gpio*)
-	M gpio$U c 79 $U 600
+	M hotplug c 84 $U 400
 	;;
 
 fd)
@@ -304,10 +274,6 @@ diskmap)
 	M diskmap c 82 0 640 operator
 	;;
 
-crypto)
-	M crypto c 47 0
-	;;
-
 bthub*)
 	M bthub$U c 81 $U
 	;;
@@ -316,26 +282,6 @@ bpf*)
 	M bpf$U c 22 $U 600
 	;;
 
-bio)
-	M bio c 80 0 600
-	;;
-
-audio*)
-	M sound$U	c 44 $U
-	M mixer$U	c 44 $(($U+16))
-	M audio$U	c 44 $(($U+128))
-	M audioctl$U	c 44 $(($U+192))
-	MKlist[${#MKlist[*]}]=";[ -e audio ] || ln -s audio$U audio"
-	MKlist[${#MKlist[*]}]=";[ -e mixer ] || ln -s mixer$U mixer"
-	MKlist[${#MKlist[*]}]=";[ -e sound ] || ln -s sound$U sound"
-	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
-	;;
-
-apm*)
-	M apm	c 25 0 644
-	M apmctl	c 25 8 644
-	;;
-
 uscanner*)
 	M uscanner$U c 74 $U 660
 	;;
@@ -365,12 +311,6 @@ ugen*)
 	done
 	;;
 
-uall)
-	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
-	R uhid2 uhid3 uscanner0 urio0 usb0 usb1 usb2 usb3 usb4 usb5
-	R usb6 usb7
-	;;
-
 ttyU[0-9a-zA-Z])
 	U=${i#ttyU*}
 	o=$(alph2d $U)
@@ -378,6 +318,12 @@ ttyU[0-9a-zA-Z])
 	M cuaU$U c 66 $(($o+128)) 660 dialer uucp
 	;;
 
+uall)
+	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
+	R uhid2 uhid3 uscanner0 urio0 usb0 usb1 usb2 usb3 usb4 usb5
+	R usb6 usb7
+	;;
+
 wsmouse[0-9]*)
 	M wsmouse$U c 69 $U 600
 	;;
@@ -486,14 +432,13 @@ ramdisk)
 	;;
 
 all)
-	R bthub0 bthub1 bthub2 bio gpio0 gpio1 gpio2 ccd0 ccd1 ccd2
-	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8
-	R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
-	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0
-	R hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall
-	R radio0 video0 video1 audio0 audio1 audio2 uk0 random lkm
-	R tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2
-	R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+	R bthub0 bthub1 bthub2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2
+	R vnd3 sd0 sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0
+	R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
+	R bpf8 bpf9 pty0 diskmap vscsi0 ch0 hotplug ptm local wscons
+	R pci0 pci1 pci2 pci3 uall video0 video1 random lkm tty00
+	R tty01 tty02 tty03 pf systrace wd0 wd1 wd2 wd3 raid0 raid1
+	R raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 2b0cd12dfb9..d11b079d76f 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.45 2010/09/30 15:27:54 claudio Exp 
+#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.46 2010/11/19 20:55:48 miod Exp 
 #	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.79 2009/01/25 17:30:48 miod Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -71,6 +71,7 @@
 #	bpf*	Berkeley Packet Filter
 #	diskmap	Disk mapper
 #	fd	fd/* nodes
+#	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	nnpfs*	NNPFS filesystem node
 #	openprom	PROM settings
@@ -272,6 +273,10 @@ lkm)
 	M lkm c 112 0 640 _lkm
 	;;
 
+hotplug)
+	M hotplug c 131 $U 400
+	;;
+
 fd)
 	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
 	while [ $n -lt 64 ];do M fd/$n c 24 $n;n=$(($n+1));done
@@ -521,10 +526,10 @@ all)
 	R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
 	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
 	R fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 bio cuaa cuab
-	R cuac cuad ttya ttyb ttyc ttyd ptm local wscons audio0 audio1
-	R audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm pf
-	R systrace xd0 xd1 xd2 xd3 raid0 raid1 raid2 raid3 std st0 st1
-	R fd
+	R cuac cuad ttya ttyb ttyc ttyd hotplug ptm local wscons
+	R audio0 audio1 audio2 uk0 random lkm tty00 tty01 tty02 tty03
+	R apm pf systrace xd0 xd1 xd2 xd3 raid0 raid1 raid2 raid3 std
+	R st0 st1 fd
 	;;
 
 presto*|xd*|xy*|sd*|raid*|ccd*)
diff --git a/share/man/man8/man8.alpha/MAKEDEV.8 b/share/man/man8/man8.alpha/MAKEDEV.8
index da2eb4013a9..fb546198cce 100644
--- a/share/man/man8/man8.alpha/MAKEDEV.8
+++ b/share/man/man8/man8.alpha/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.49 2010/10/11 14:34:36 claudio Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.50 2010/11/19 20:56:07 miod Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.alpha/MAKEDEV.md,v 1.50 2010/09/30 15:27:54 claudio Exp 
+.\"	OpenBSD: etc.alpha/MAKEDEV.md,v 1.51 2010/11/19 20:55:46 miod Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 11 2010 $
+.Dd $Mdocdate: November 19 2010 $
 .Dt MAKEDEV 8 alpha
 .Os
 .Sh NAME
@@ -189,9 +189,15 @@ Generic HID devices, see
 .It Ar ulpt*
 Printer devices, see
 .Xr ulpt 4 .
+.It Ar urio*
+Diamond Multimedia Rio 500, see
+.Xr urio 4 .
 .It Ar usb*
 Bus control devices used by usbd for attach/detach, see
 .Xr usb 4 .
+.It Ar uscanner*
+Scanners, see
+.Xr uscanner 4 .
 .El
 .Pp
 .Sy Special purpose devices
diff --git a/share/man/man8/man8.hp300/MAKEDEV.8 b/share/man/man8/man8.hp300/MAKEDEV.8
index 6f736592f89..d16d90ed628 100644
--- a/share/man/man8/man8.hp300/MAKEDEV.8
+++ b/share/man/man8/man8.hp300/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.55 2010/10/11 14:34:36 claudio Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.56 2010/11/19 20:56:07 miod Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.hp300/MAKEDEV.md,v 1.41 2010/09/30 15:27:54 claudio Exp 
+.\"	OpenBSD: etc.hp300/MAKEDEV.md,v 1.42 2010/11/19 20:55:48 miod Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 11 2010 $
+.Dd $Mdocdate: November 19 2010 $
 .Dt MAKEDEV 8 hp300
 .Os
 .Sh NAME
@@ -182,6 +182,9 @@ Disk mapper, see
 .It Ar fd
 fd/* nodes, see
 .Xr fd 4 .
+.It Ar hotplug
+devices hot plugging, see
+.Xr hotplug 4 .
 .It Ar lkm
 Loadable kernel modules interface, see
 .Xr lkm 4 .
diff --git a/share/man/man8/man8.hppa64/MAKEDEV.8 b/share/man/man8/man8.hppa64/MAKEDEV.8
index 8af3983e82e..dc793024989 100644
--- a/share/man/man8/man8.hppa64/MAKEDEV.8
+++ b/share/man/man8/man8.hppa64/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.28 2010/10/11 14:34:36 claudio Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.29 2010/11/19 20:56:07 miod Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.21 2010/09/30 15:27:54 claudio Exp 
+.\"	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.22 2010/11/19 20:55:48 miod Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 11 2010 $
+.Dd $Mdocdate: November 19 2010 $
 .Dt MAKEDEV 8 hppa64
 .Os
 .Sh NAME
@@ -160,6 +160,34 @@ IEEE 1284 centronics printer, see
 .Xr lpt 4 .
 .El
 .Pp
+.Sy USB devices
+.Bl -tag -width tenletters -compact
+.It Ar uall
+All USB devices, see
+.Xr usb 4 .
+.It Ar usb*
+Bus control devices used by usbd for attach/detach, see
+.Xr usb 4 .
+.It Ar uhid*
+Generic HID devices, see
+.Xr uhid 4 .
+.It Ar ugen*
+Generic USB devices, see
+.Xr ugen 4 .
+.It Ar ulpt*
+Printer devices, see
+.Xr ulpt 4 .
+.It Ar urio*
+Diamond Multimedia Rio 500, see
+.Xr urio 4 .
+.It Ar ttyU*
+USB serial ports, see
+.Xr ucom 4 .
+.It Ar uscanner*
+Scanners, see
+.Xr uscanner 4 .
+.El
+.Pp
 .Sy Special purpose devices
 .Bl -tag -width tenletters -compact
 .It Ar audio*
diff --git a/share/man/man8/man8.loongson/MAKEDEV.8 b/share/man/man8/man8.loongson/MAKEDEV.8
index cb9fe635c78..6f22c707c6f 100644
--- a/share/man/man8/man8.loongson/MAKEDEV.8
+++ b/share/man/man8/man8.loongson/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.9 2010/10/11 14:34:36 claudio Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.10 2010/11/19 20:56:07 miod Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.loongson/MAKEDEV.md,v 1.9 2010/09/30 15:27:54 claudio Exp 
+.\"	OpenBSD: etc.loongson/MAKEDEV.md,v 1.10 2010/11/19 20:55:48 miod Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 11 2010 $
+.Dd $Mdocdate: November 19 2010 $
 .Dt MAKEDEV 8 loongson
 .Os
 .Sh NAME
@@ -173,6 +173,9 @@ Diamond Multimedia Rio 500, see
 .It Ar usb*
 Bus control devices used by usbd for attach/detach, see
 .Xr usb 4 .
+.It Ar uscanner*
+Scanners, see
+.Xr uscanner 4 .
 .El
 .Pp
 .Sy Special purpose devices
diff --git a/share/man/man8/man8.sgi/MAKEDEV.8 b/share/man/man8/man8.sgi/MAKEDEV.8
index 92a57d17fa9..522f9c2abb8 100644
--- a/share/man/man8/man8.sgi/MAKEDEV.8
+++ b/share/man/man8/man8.sgi/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.40 2010/10/11 14:34:36 claudio Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.41 2010/11/19 20:56:07 miod Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.sgi/MAKEDEV.md,v 1.32 2010/09/30 15:27:54 claudio Exp 
+.\"	OpenBSD: etc.sgi/MAKEDEV.md,v 1.33 2010/11/19 20:55:48 miod Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 11 2010 $
+.Dd $Mdocdate: November 19 2010 $
 .Dt MAKEDEV 8 sgi
 .Os
 .Sh NAME
@@ -173,6 +173,9 @@ Diamond Multimedia Rio 500, see
 .It Ar usb*
 Bus control devices used by usbd for attach/detach, see
 .Xr usb 4 .
+.It Ar uscanner*
+Scanners, see
+.Xr uscanner 4 .
 .El
 .Pp
 .Sy Special purpose devices
diff --git a/share/man/man8/man8.socppc/MAKEDEV.8 b/share/man/man8/man8.socppc/MAKEDEV.8
index 24387a9e49f..336dd461ddd 100644
--- a/share/man/man8/man8.socppc/MAKEDEV.8
+++ b/share/man/man8/man8.socppc/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.14 2010/10/11 14:34:36 claudio Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.15 2010/11/19 20:56:07 miod Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.socppc/MAKEDEV.md,v 1.12 2010/09/30 15:27:54 claudio Exp 
+.\"	OpenBSD: etc.socppc/MAKEDEV.md,v 1.13 2010/11/19 20:55:48 miod Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 11 2010 $
+.Dd $Mdocdate: November 19 2010 $
 .Dt MAKEDEV 8 socppc
 .Os
 .Sh NAME
@@ -155,12 +155,12 @@ wscons mice, see
 .Pp
 .Sy USB devices
 .Bl -tag -width tenletters -compact
-.It Ar ttyU*
-USB serial ports, see
-.Xr ucom 4 .
 .It Ar uall
 All USB devices, see
 .Xr usb 4 .
+.It Ar ttyU*
+USB serial ports, see
+.Xr ucom 4 .
 .It Ar ugen*
 Generic USB devices, see
 .Xr ugen 4 .
@@ -183,45 +183,24 @@ Scanners, see
 .Pp
 .Sy Special purpose devices
 .Bl -tag -width tenletters -compact
-.It Ar apm
-Power management device, see
-.Xr apm 4 .
-.It Ar audio*
-Audio devices, see
-.Xr audio 4 .
-.It Ar bio
-ioctl tunnel pseudo-device, see
-.Xr bio 4 .
 .It Ar bpf*
 Berkeley Packet Filter, see
 .Xr bpf 4 .
 .It Ar bthub*
 Bluetooth Hubs, see
 .Xr bthub 4 .
-.It Ar crypto
-Hardware crypto access driver, see
-.Xr crypto 4 .
 .It Ar diskmap
 Disk mapper, see
 .Xr diskmap 4 .
 .It Ar fd
 fd/* nodes, see
 .Xr fd 4 .
-.It Ar gpio*
-General Purpose Input/Output, see
-.Xr gpio 4 .
 .It Ar hotplug
 devices hot plugging, see
 .Xr hotplug 4 .
-.It Ar iop*
-I2O controller devices, see
-.Xr iop 4 .
 .It Ar lkm
 Loadable kernel modules interface, see
 .Xr lkm 4 .
-.It Ar nnpfs*
-NNPFS filesystem node, see
-.Xr mount_nnpfs 8 .
 .It Ar pci*
 PCI bus devices, see
 .Xr pci 4 .
@@ -231,9 +210,6 @@ Packet Filter, see
 .It Ar pppx*
 PPP Multiplexer, see
 .Xr pppx 4 .
-.It Ar radio*
-FM tuner devices, see
-.Xr radio 4 .
 .It Ar *random
 In-kernel random data source, see
 .Xr random 4 .
@@ -243,9 +219,6 @@ System call tracing device, see
 .It Ar tun*
 Network tunnel driver, see
 .Xr tun 4 .
-.It Ar uk*
-Unknown SCSI devices, see
-.Xr uk 4 .
 .It Ar video*
 Video V4L2 devices, see
 .Xr video 4 .
diff --git a/share/man/man8/man8.sparc/MAKEDEV.8 b/share/man/man8/man8.sparc/MAKEDEV.8
index 88c0a338642..d17777938f0 100644
--- a/share/man/man8/man8.sparc/MAKEDEV.8
+++ b/share/man/man8/man8.sparc/MAKEDEV.8
@@ -1,9 +1,9 @@
-.\" $OpenBSD: MAKEDEV.8,v 1.55 2010/10/11 14:34:36 claudio Exp $
+.\" $OpenBSD: MAKEDEV.8,v 1.56 2010/11/19 20:56:07 miod Exp $
 .\"
 .\" THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 .\" generated from:
 .\"
-.\"	OpenBSD: etc.sparc/MAKEDEV.md,v 1.45 2010/09/30 15:27:54 claudio Exp 
+.\"	OpenBSD: etc.sparc/MAKEDEV.md,v 1.46 2010/11/19 20:55:48 miod Exp 
 .\"	OpenBSD: MAKEDEV.common,v 1.53 2010/09/30 15:27:54 claudio Exp 
 .\"	OpenBSD: MAKEDEV.man,v 1.7 2009/03/18 17:34:25 sobrado Exp 
 .\"	OpenBSD: MAKEDEV.mansub,v 1.2 2004/02/20 19:13:01 miod Exp 
@@ -23,7 +23,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 11 2010 $
+.Dd $Mdocdate: November 19 2010 $
 .Dt MAKEDEV 8 sparc
 .Os
 .Sh NAME
@@ -208,6 +208,9 @@ Disk mapper, see
 .It Ar fd
 fd/* nodes, see
 .Xr fd 4 .
+.It Ar hotplug
+devices hot plugging, see
+.Xr hotplug 4 .
 .It Ar lkm
 Loadable kernel modules interface, see
 .Xr lkm 4 .