Regen

22 files changed, 660 insertions, 661 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 2ae73b62c0b..b181216dae0 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -50,8 +50,8 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
@@ -60,8 +60,8 @@
 #	lpa*	Polled printer port
 #	lpt*	IEEE 1284 centronics printer
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -71,27 +71,27 @@
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
+#	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	hotplug	devices hot plugging
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
+#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
-#	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
+#	rmidi*	Raw MIDI devices
 #	speaker	PC speaker
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	bthub*	Bluetooth Hubs
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -247,22 +247,10 @@ ttyB*|ttyc*)
 	M cua$type$U c $major $(($minor+128)) 660 dialer uucp
 	;;
 
-diskmap)
-	M diskmap c 63 0 640 operator
-	;;
-
-bthub*)
-	M bthub$U c 62 $U
-	;;
-
 vscsi*)
 	M vscsi$U c 61 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 44 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -288,6 +276,10 @@ speaker)
 	M speaker c 40 0 600
 	;;
 
+rmidi*)
+	M rmidi$U c 41 $U 666
+	;;
+
 *random)
 	n=0
 	for pre in " " s u a
@@ -297,10 +289,6 @@ speaker)
 	done
 	;;
 
-rmidi*)
-	M rmidi$U c 41 $U 666
-	;;
-
 radio*)
 	M radio$U     c 59 $U
 	MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
@@ -315,6 +303,10 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 music*)
 	M music$U     c 42 $U
 	M sequencer$U c 42 $(($U+128))
@@ -340,10 +332,18 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 63 0 640 operator
+	;;
+
 crypto)
 	M crypto c 57 0
 	;;
 
+bthub*)
+	M bthub$U c 62 $U
+	;;
+
 bpf*)
 	M bpf$U c 11 $U 600
 	;;
@@ -388,6 +388,11 @@ ugen*)
 	done
 	;;
 
+uall)
+	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
+	R uhid2 uhid3 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	;;
+
 ttyU[0-9a-zA-Z])
 	U=${i#ttyU*}
 	o=$(alph2d $U)
@@ -395,11 +400,6 @@ ttyU[0-9a-zA-Z])
 	M cuaU$U c 49 $(($o+128)) 660 dialer uucp
 	;;
 
-uall)
-	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
-	R uhid2 uhid3 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
-	;;
-
 lpt*|lpa*)
 	case $i in
 	lpt*) n=lpt f=0;;
@@ -421,6 +421,12 @@ wskbd[0-9]*)
 	M wskbd$U c 29 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -440,12 +446,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 33565f064ba..ba46637c7a8 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -49,8 +49,8 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
@@ -59,8 +59,8 @@
 #	lpa*	Polled printer port
 #	lpt*	IEEE 1284 centronics printer
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -76,6 +76,7 @@
 #	bpf*	Berkeley Packet Filter
 #	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
 #	gpio*	General Purpose Input/Output
@@ -84,22 +85,21 @@
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
+#	nnpfs*	NNPFS filesystem node
 #	nvram	NVRAM access
 #	pci*	PCI bus devices
 #	pctr*	PC Performance Tuning Register access device
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
-#	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
+#	rmidi*	Raw MIDI devices
 #	speaker	PC speaker
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -250,18 +250,10 @@ ttyc*)
 	M cuac$U c 38 $(($U+128)) 660 dialer uucp
 	;;
 
-diskmap)
-	M diskmap c 90 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 89 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 44 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -287,6 +279,10 @@ speaker)
 	M speaker c 27 0 600
 	;;
 
+rmidi*)
+	M rmidi$U c 52 $U 666
+	;;
+
 *random)
 	n=0
 	for pre in " " s u a
@@ -296,10 +292,6 @@ speaker)
 	done
 	;;
 
-rmidi*)
-	M rmidi$U c 52 $U 666
-	;;
-
 radio*)
 	M radio$U     c 76 $U
 	MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
@@ -322,6 +314,10 @@ nvram)
 	M nvram c 85 0 440 kmem
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 music*)
 	M music$U     c 53 $U
 	M sequencer$U c 53 $(($U+128))
@@ -359,6 +355,10 @@ drm*)
 	M drm$U c 87 $U 660
 	;;
 
+diskmap)
+	M diskmap c 90 0 640 operator
+	;;
+
 crypto)
 	M crypto c 70 0
 	;;
@@ -429,6 +429,12 @@ 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)
@@ -436,12 +442,6 @@ 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
-	;;
-
 lpt*|lpa*)
 	case $i in
 	lpt*) n=lpt f=0;;
@@ -463,6 +463,12 @@ wskbd[0-9]*)
 	M wskbd$U c 67 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -482,12 +488,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.armish/MAKEDEV b/etc/etc.armish/MAKEDEV
index c5b3b3dee01..3f3f6e46dd5 100644
--- a/etc/etc.armish/MAKEDEV
+++ b/etc/etc.armish/MAKEDEV
@@ -47,14 +47,14 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmouse*	wscons mice
 #	wsmux	wscons keyboard/mouse mux devices
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -65,28 +65,28 @@
 #	apm	Power management device
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
-#	hotplug	devices hot plugging
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
+#	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
+#	hotplug	devices hot plugging
 #	iop*	I2O controller devices
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
+#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
-#	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
+#	rmidi*	Raw MIDI devices
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	systrace*	System call tracing device
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	bthub*	Bluetooth Hubs
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -231,22 +231,10 @@ std)
 	M klog		c 6 0 600
 	;;
 
-diskmap)
-	M diskmap c 102 0 640 operator
-	;;
-
-bthub*)
-	M bthub$U c 101 $U
-	;;
-
 vscsi*)
 	M vscsi$U c 100 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 38 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -268,6 +256,10 @@ tun*)
 	M tun$U c 33 $U 600
 	;;
 
+rmidi*)
+	M rmidi$U c 57 $U 666
+	;;
+
 *random)
 	n=0
 	for pre in " " s u a
@@ -277,10 +269,6 @@ tun*)
 	done
 	;;
 
-rmidi*)
-	M rmidi$U c 57 $U 666
-	;;
-
 radio*)
 	M radio$U     c 97 $U
 	MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
@@ -295,6 +283,10 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 music*)
 	M music$U     c 58 $U
 	M sequencer$U c 58 $(($U+128))
@@ -310,16 +302,28 @@ iop*)
 	M iop$U c 73 $U 660
 	;;
 
+hotplug)
+	M hotplug c 37 $U 400
+	;;
+
 fd)
 	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
 	while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 102 0 640 operator
+	;;
+
 crypto)
 	M crypto c 47 0
 	;;
 
+bthub*)
+	M bthub$U c 101 $U
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -328,10 +332,6 @@ bktr*)
 	M bktr$U c 75 $U 644
 	;;
 
-hotplug)
-	M hotplug c 37 $U 400
-	;;
-
 bio)
 	M bio c 52 0 600
 	;;
@@ -381,6 +381,12 @@ 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)
@@ -388,12 +394,6 @@ ttyU[0-9a-zA-Z])
 	M cuaU$U c 68 $(($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
-	;;
-
 wsmux|wsmouse|wskbd)
 	M wsmouse c 63 0 600
 	M wskbd c 63 1 600
@@ -407,6 +407,12 @@ wskbd[0-9]*)
 	M wskbd$U c 61 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -426,12 +432,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.aviion/MAKEDEV b/etc/etc.aviion/MAKEDEV
index 36181809634..67c6f3bc43d 100644
--- a/etc/etc.aviion/MAKEDEV
+++ b/etc/etc.aviion/MAKEDEV
@@ -47,17 +47,17 @@
 # Special purpose devices:
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -198,18 +198,10 @@ std)
 	;;
 
 
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 53 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 uk*)
 	M uk$U c 41 $U 640 operator
 	;;
@@ -239,6 +231,10 @@ nvram0)
 	M nvram0 c 10 0 640 kmem
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -249,6 +245,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 54 0 640 operator
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index c2e78e8af04..0fcbb5961fa 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -50,8 +50,8 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
@@ -61,16 +61,16 @@
 # Special purpose devices:
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -278,18 +278,10 @@ ppi*)
 	;;
 
 
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 53 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 uk*)
 	M uk$U c 37 $U 640 operator
 	;;
@@ -315,6 +307,10 @@ pf*)
 	M pf c 33 0 600
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -325,6 +321,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 54 0 640 operator
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -346,6 +346,12 @@ wskbd[0-9]*)
 	M wskbd$U c 41 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -365,12 +371,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 3bda54430f2..6c1703a6f4c 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -47,8 +47,8 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
@@ -65,13 +65,16 @@
 #	ttyU*	USB serial ports
 #	uscanner*	Scanners
 # Special purpose devices:
-#	bio	ioctl tunnel pseudo-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
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pdc	PDC device
 #	pf*	Packet Filter
@@ -80,10 +83,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	bthub*	Bluetooth Hubs
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -229,22 +229,10 @@ std)
 	M pdc		c 22 0 640 operator
 	;;
 
-diskmap)
-	M diskmap c 56 0 640 operator
-	;;
-
-bthub*)
-	M bthub$U c 55 $U
-	;;
-
 vscsi*)
 	M vscsi$U c 54 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 32 $U 600
-	;;
-
 video*)
 	M video$U  c 33 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -280,6 +268,10 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
+nnpfs*)
+	M nnpfs$U c 32 $U 600
+	;;
+
 lkm)
 	M lkm c 19 0 640 _lkm
 	;;
@@ -294,14 +286,26 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 56 0 640 operator
+	;;
+
 crypto)
 	M crypto c 36 0
 	;;
 
+bthub*)
+	M bthub$U c 55 $U
+	;;
+
 bpf*)
 	M bpf$U c 17 $U 600
 	;;
 
+bio)
+	M bio c 37 0 600
+	;;
+
 audio*)
 	M sound$U	c 35 $U
 	M mixer$U	c 35 $(($U+16))
@@ -313,10 +317,6 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-bio)
-	M bio c 37 0 600
-	;;
-
 uscanner*)
 	M uscanner$U c 46 $U 660
 	;;
@@ -380,6 +380,12 @@ wskbd[0-9]*)
 	M wskbd$U c 28 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -399,12 +405,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index a525636200a..0a52d48dfbf 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -47,22 +47,23 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
 #	wsmouse*	wscons mice
 # Printers:
 #	lpt*	IEEE 1284 centronics printer
-# USB devices:
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pdc	PDC device
 #	pf*	Packet Filter
@@ -71,9 +72,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -219,18 +218,10 @@ std)
 	M pdc		c 22 0 640 operator
 	;;
 
-diskmap)
-	M diskmap c 47 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 46 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 32 $U 600
-	;;
-
 video*)
 	M video$U  c 33 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -266,6 +257,10 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
+nnpfs*)
+	M nnpfs$U c 32 $U 600
+	;;
+
 lkm)
 	M lkm c 19 0 640 _lkm
 	;;
@@ -276,6 +271,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 47 0 640 operator
+	;;
+
 crypto)
 	M crypto c 36 0
 	;;
@@ -320,6 +319,12 @@ wskbd[0-9]*)
 	M wskbd$U c 28 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -339,12 +344,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 48a0e2e55f3..91a2e956d17 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -60,8 +60,8 @@
 #	lpa*	Polled printer port
 #	lpt*	IEEE 1284 centronics printer
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -70,14 +70,15 @@
 #	uscanner*	Scanners
 # Special purpose devices:
 #	agp*	AGP bridge
-#	apm	Power management device
 #	amdmsr	AMD MSR access device
+#	apm	Power management device
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
 #	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	drm*	Direct Rendering Manager
 #	fd	fd/* nodes
 #	gpio*	General Purpose Input/Output
@@ -87,22 +88,21 @@
 #	joy*	Joystick driver
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
+#	nnpfs*	NNPFS filesystem node
 #	nvram	NVRAM access
 #	pci*	PCI bus devices
 #	pctr*	PC Performance Tuning Register access device
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
-#	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
+#	rmidi*	Raw MIDI devices
 #	speaker	PC speaker
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -253,18 +253,10 @@ ttyc*)
 	M cuac$U c 38 $(($U+128)) 660 dialer uucp
 	;;
 
-diskmap)
-	M diskmap c 91 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 90 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 44 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -290,6 +282,10 @@ speaker)
 	M speaker c 27 0 600
 	;;
 
+rmidi*)
+	M rmidi$U c 52 $U 666
+	;;
+
 *random)
 	n=0
 	for pre in " " s u a
@@ -299,10 +295,6 @@ speaker)
 	done
 	;;
 
-rmidi*)
-	M rmidi$U c 52 $U 666
-	;;
-
 radio*)
 	M radio$U     c 76 $U
 	MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
@@ -325,6 +317,10 @@ nvram)
 	M nvram c 84 0 440 kmem
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 music*)
 	M music$U     c 53 $U
 	M sequencer$U c 53 $(($U+128))
@@ -366,6 +362,10 @@ drm*)
 	M drm$U c 88 $U 660
 	;;
 
+diskmap)
+	M diskmap c 91 0 640 operator
+	;;
+
 crypto)
 	M crypto c 70 0
 	;;
@@ -397,15 +397,15 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-amdmsr*)
-	M amdmsr c 89 $U 
-	;;
-
 apm*)
 	M apm	c 21 0 644
 	M apmctl	c 21 8 644
 	;;
 
+amdmsr*)
+	M amdmsr c 89 $U 
+	;;
+
 agp*)
 	M agp$U c 87 $U
 	MKlist[${#MKlist[*]}]=";[ -e agpgart ] || ln -s agp$U agpgart"
@@ -440,6 +440,12 @@ 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)
@@ -447,12 +453,6 @@ 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
-	;;
-
 lpt*|lpa*)
 	case $i in
 	lpt*) n=lpt f=0;;
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index 3e6f87980bd..7a30a34eebd 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -47,14 +47,14 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmouse*	wscons mice
 #	wsmux	wscons keyboard/mouse mux devices
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -64,25 +64,25 @@
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
-#	hotplug	devices hot plugging
 #	bpf*	Berkeley Packet Filter
+#	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
+#	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
+#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
-#	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
+#	rmidi*	Raw MIDI devices
+#	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	systrace*	System call tracing device
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	bthub*	Bluetooth Hubs
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -227,31 +227,15 @@ std)
 	M klog		c 6 0 600
 	;;
 
-diskmap)
-	M diskmap c 101 0 640 operator
-	;;
-
-bthub*)
-	M bthub$U c 100 $U
-	;;
-
 vscsi*)
 	M vscsi$U c 99 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 77 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
 	;;
 
-systrace)
-	M systrace c 50 0 644
-	;;
-
 uk*)
 	M uk$U c 28 $U 640 operator
 	;;
@@ -260,6 +244,14 @@ tun*)
 	M tun$U c 33 $U 600
 	;;
 
+systrace)
+	M systrace c 50 0 644
+	;;
+
+rmidi*)
+	M rmidi$U c 57 $U 666
+	;;
+
 *random)
 	n=0
 	for pre in " " s u a
@@ -269,10 +261,6 @@ tun*)
 	done
 	;;
 
-rmidi*)
-	M rmidi$U c 57 $U 666
-	;;
-
 radio*)
 	M radio$U     c 97 $U
 	MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
@@ -287,6 +275,10 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 music*)
 	M music$U     c 58 $U
 	M sequencer$U c 58 $(($U+128))
@@ -298,22 +290,30 @@ lkm)
 	M lkm c 35 0 640 _lkm
 	;;
 
+hotplug)
+	M hotplug c 37 $U 400
+	;;
+
 fd)
 	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
 	while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 101 0 640 operator
+	;;
+
 crypto)
 	M crypto c 47 0
 	;;
 
-bpf*)
-	M bpf$U c 22 $U 600
+bthub*)
+	M bthub$U c 100 $U
 	;;
 
-hotplug)
-	M hotplug c 37 $U 400
+bpf*)
+	M bpf$U c 22 $U 600
 	;;
 
 bio)
@@ -360,6 +360,12 @@ 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)
@@ -367,12 +373,6 @@ ttyU[0-9a-zA-Z])
 	M cuaU$U c 68 $(($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
-	;;
-
 wsmux|wsmouse|wskbd)
 	M wsmouse c 63 0 600
 	M wskbd c 63 1 600
@@ -386,6 +386,12 @@ wskbd[0-9]*)
 	M wskbd$U c 61 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -405,12 +411,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index cc06ca7244e..56d788a9012 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -46,15 +46,15 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
 #	wsmouse*	wscons mice
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -65,9 +65,12 @@
 #	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
 #	hotplug	devices hot plugging
+#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
@@ -75,10 +78,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
-#	bthub*	Bluetooth Hubs
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -218,22 +218,10 @@ std)
 	M klog		c 6 0 600
 	;;
 
-diskmap)
-	M diskmap c 70 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 69 $U 600
 	;;
 
-bthub*)
-	M bthub$U c 68 $U
-	;;
-
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 45 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -269,6 +257,10 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 hotplug)
 	M hotplug c 67 $U 400
 	;;
@@ -279,10 +271,18 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 70 0 640 operator
+	;;
+
 crypto)
 	M crypto c 47 0
 	;;
 
+bthub*)
+	M bthub$U c 68 $U
+	;;
+
 bpf*)
 	M bpf$U c 12 $U 600
 	;;
@@ -332,6 +332,11 @@ ugen*)
 	done
 	;;
 
+uall)
+	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	;;
+
 ttyU[0-9a-zA-Z])
 	U=${i#ttyU*}
 	o=$(alph2d $U)
@@ -339,11 +344,6 @@ 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 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
-	;;
-
 wsmouse[0-9]*)
 	M wsmouse$U c 27 $U 600
 	;;
@@ -357,6 +357,12 @@ wskbd[0-9]*)
 	M wskbd$U c 26 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -376,12 +382,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index 2123124c55f..e0b4c93a6f1 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV
@@ -45,8 +45,8 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
@@ -54,17 +54,17 @@
 # Special purpose devices:
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lcd	front panel LCD display
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -205,18 +205,10 @@ std)
 	;;
 
 
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 53 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 uk*)
 	M uk$U c 41 $U 640 operator
 	;;
@@ -242,6 +234,10 @@ pf*)
 	M pf c 39 0 600
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -256,6 +252,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 54 0 640 operator
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -277,6 +277,12 @@ wskbd[0-9]*)
 	M wskbd$U c 14 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -296,12 +302,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index f77db5f56b4..84c36794865 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV
@@ -45,8 +45,8 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
@@ -55,16 +55,16 @@
 #	asc*	ASC Audio device
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -230,18 +230,10 @@ asc*)
 	M asc$U c 36 $U
 	;;
 
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 53 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 uk*)
 	M uk$U c 34 $U 640 operator
 	;;
@@ -267,6 +259,10 @@ pf*)
 	M pf c 35 0 600
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 lkm)
 	M lkm c 25 0 640 _lkm
 	;;
@@ -277,6 +273,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 54 0 640 operator
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -302,6 +302,12 @@ wskbd[0-9]*)
 	M wskbd$U c 39 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -321,12 +327,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index d40abfba6c8..d6fe1d5f046 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -41,8 +41,8 @@
 #	ch*	SCSI media changers
 #	st*	SCSI tape drives
 # Terminal ports:
-#	tty[0-7][0-9a-f]	NS16x50 serial ports
 #	cua[a-z]*	Zilog 8530 serial ports
+#	tty[0-7][0-9a-f]	NS16x50 serial ports
 #	tty[a-z]*	Zilog 8530 serial ports
 # Pseudo terminals:
 #	ptm	pty master device
@@ -72,11 +72,13 @@
 #	bpf*	Berkeley Packet Filter
 #	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	hotplug	devices hot plugging
 #	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
 #	radio*	FM tuner devices
@@ -86,9 +88,7 @@
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -231,18 +231,10 @@ std)
 	;;
 
 
-diskmap)
-	M diskmap c 84 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 83 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 45 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -287,6 +279,10 @@ 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
 	;;
@@ -295,20 +291,24 @@ iop*)
 	M iop$U c 73 $U 660
 	;;
 
-gpio*)
-	M gpio$U c 79 $U 600
-	;;
-
 hotplug)
 	M hotplug c 78 $U 400
 	;;
 
+gpio*)
+	M gpio$U c 79 $U 600
+	;;
+
 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
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 84 0 640 operator
+	;;
+
 crypto)
 	M crypto c 47 0
 	;;
@@ -461,6 +461,13 @@ tty[a-z])
 	M tty$u c 7 $n 660 dialer uucp
 	;;
 
+tty[0-7][0-9a-f])
+	U=${i#tty*}
+	o=$(h2d $U)
+	M tty$U c 26 $o 660 dialer uucp
+	M cua$U c 26 $(($o+128)) 660 dialer uucp
+	;;
+
 cua[a-z])
 	u=${i#cua*}
 	case $u in
@@ -471,13 +478,6 @@ cua[a-z])
 	M cua$u c 7 $(($n+128)) 660 dialer uucp
 	;;
 
-tty[0-7][0-9a-f])
-	U=${i#tty*}
-	o=$(h2d $U)
-	M tty$U c 26 $o 660 dialer uucp
-	M cua$U c 26 $(($o+128)) 660 dialer uucp
-	;;
-
 st*)
 	n=$(($U*16))
 	for pre in " " n e en
diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index 2c029b8785b..a056eaa0f4f 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -40,8 +40,8 @@
 #	st*	SCSI tape drives
 # Terminal ports:
 #	cuaa-d	On-board call-up devices
-#	ttya-d	On-board serial ports
 #	tty0*	CL-CD2400 serial ports
+#	ttya-d	On-board serial ports
 #	ttyd*	MC68681 serial ports
 #	ttyw*	WG CL-CD2400 serial ports
 # Pseudo terminals:
@@ -53,9 +53,11 @@
 # Special purpose devices:
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	flash0	On-board flash memory
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
@@ -65,9 +67,7 @@
 #	uk*	Unknown SCSI devices
 #	vmel0	VMEbus D32 space
 #	vmes0	VMEbus D16 space
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -208,18 +208,10 @@ std)
 	;;
 
 
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 53 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 vmes0)
 	M vmes0 c 32 0 640 kmem
 	;;
@@ -261,6 +253,10 @@ nvram0)
 	M nvram0 c 10 0 640 kmem
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -275,6 +271,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 54 0 640 operator
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -339,17 +339,6 @@ ttyd[01])
 	esac
 	;;
 
-tty0*)
-	u=${i#tty0*}
-	case $u in
-	0|1|2|3)
-		M tty0$u c 13 $u 660 dialer uucp
-		M cua0$u c 13 $(($u+128)) 660 dialer uucp
-		;;
-	*) echo unknown tty device $i ;;
-	esac
-	;;
-
 tty[a-z])
 	u=${i#tty*}
 	case $u in
@@ -366,6 +355,17 @@ tty[a-z])
 	esac
 	;;
 
+tty0*)
+	u=${i#tty0*}
+	case $u in
+	0|1|2|3)
+		M tty0$u c 13 $u 660 dialer uucp
+		M cua0$u c 13 $(($u+128)) 660 dialer uucp
+		;;
+	*) echo unknown tty device $i ;;
+	esac
+	;;
+
 cua[a-z])
 	u=${i#cua*}
 	case $u in
diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index b7d8f1ea66f..c36908b6c54 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV
@@ -49,20 +49,20 @@
 # Special purpose devices:
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	sram0	On-board static memory
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
+#	uk*	Unknown SCSI devices
 #	vmel0	VMEbus D32 space
 #	vmes0	VMEbus D16 space
-#	uk*	Unknown SCSI devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -203,22 +203,10 @@ std)
 	;;
 
 
-diskmap)
-	M diskmap c 54 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 53 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
-uk*)
-	M uk$U c 41 $U 640 operator
-	;;
-
 vmes0)
 	M vmes0 c 32 0 640 kmem
 	;;
@@ -227,6 +215,10 @@ vmel0)
 	M vmel0 c 31 0 640 kmem
 	;;
 
+uk*)
+	M uk$U c 41 $U 640 operator
+	;;
+
 tun*)
 	M tun$U c 23 $U 600
 	;;
@@ -256,6 +248,10 @@ nvram0)
 	M nvram0 c 10 0 640 kmem
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 lkm)
 	M lkm c 24 0 640 _lkm
 	;;
@@ -266,6 +262,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 54 0 640 operator
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
diff --git a/etc/etc.palm/MAKEDEV b/etc/etc.palm/MAKEDEV
index 452a42a6e26..7b0dddcdbe0 100644
--- a/etc/etc.palm/MAKEDEV
+++ b/etc/etc.palm/MAKEDEV
@@ -47,14 +47,14 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmouse*	wscons mice
 #	wsmux	wscons keyboard/mouse mux devices
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -64,27 +64,27 @@
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
-#	hotplug	devices hot plugging
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
+#	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
+#	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
+#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
-#	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
-#	tun*	Network tunnel driver
-#	uk*	Unknown SCSI devices
+#	rmidi*	Raw MIDI devices
 #	systrace*	System call tracing device
+#	tun*	Network tunnel driver
 #	tuner*	Tuner devices
+#	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	bthub*	Bluetooth Hubs
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -229,41 +229,33 @@ std)
 	M klog		c 6 0 600
 	;;
 
-diskmap)
-	M diskmap c 102 0 640 operator
-	;;
-
-bthub*)
-	M bthub$U c 101 $U
-	;;
-
 vscsi*)
 	M vscsi$U c 100 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 38 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
 	;;
 
+uk*)
+	M uk$U c 28 $U 640 operator
+	;;
+
 tuner*)
 	M tuner$U c 75 $(($(($U*2))+16)) 644
 	;;
 
-systrace)
-	M systrace c 50 0 644
+tun*)
+	M tun$U c 33 $U 600
 	;;
 
-uk*)
-	M uk$U c 28 $U 640 operator
+systrace)
+	M systrace c 50 0 644
 	;;
 
-tun*)
-	M tun$U c 33 $U 600
+rmidi*)
+	M rmidi$U c 57 $U 666
 	;;
 
 *random)
@@ -275,10 +267,6 @@ tun*)
 	done
 	;;
 
-rmidi*)
-	M rmidi$U c 57 $U 666
-	;;
-
 radio*)
 	M radio$U     c 97 $U
 	MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
@@ -288,6 +276,10 @@ pf*)
 	M pf c 46 0 600
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 music*)
 	M music$U     c 58 $U
 	M sequencer$U c 58 $(($U+128))
@@ -299,16 +291,28 @@ lkm)
 	M lkm c 35 0 640 _lkm
 	;;
 
+hotplug)
+	M hotplug c 37 $U 400
+	;;
+
 fd)
 	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
 	while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 102 0 640 operator
+	;;
+
 crypto)
 	M crypto c 47 0
 	;;
 
+bthub*)
+	M bthub$U c 101 $U
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -321,10 +325,6 @@ bio)
 	M bio c 52 0 600
 	;;
 
-hotplug)
-	M hotplug c 37 $U 400
-	;;
-
 audio*)
 	M sound$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
@@ -370,6 +370,12 @@ 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)
@@ -377,12 +383,6 @@ ttyU[0-9a-zA-Z])
 	M cuaU$U c 68 $(($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
-	;;
-
 wsmux|wsmouse|wskbd)
 	M wsmouse c 63 0 600
 	M wskbd c 63 1 600
@@ -396,6 +396,12 @@ wskbd[0-9]*)
 	M wskbd$U c 61 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -415,12 +421,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index 3ded16a34ac..294216c8ba1 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -46,15 +46,15 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
 #	wsmouse*	wscons mice
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -65,8 +65,10 @@
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	hotplug	devices hot plugging
+#	nnpfs*	NNPFS filesystem node
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
@@ -74,9 +76,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -216,18 +216,10 @@ std)
 	M klog		c 6 0 600
 	;;
 
-diskmap)
-	M diskmap c 69 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 68 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 45 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -263,6 +255,10 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 hotplug)
 	M hotplug c 67 $U 400
 	;;
@@ -273,6 +269,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 69 0 640 operator
+	;;
+
 crypto)
 	M crypto c 47 0
 	;;
@@ -321,6 +321,11 @@ ugen*)
 	done
 	;;
 
+uall)
+	R ttyU0 ttyU1 ttyU2 ttyU3 ugen0 ugen1 ulpt0 ulpt1 uhid0 uhid1
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
+	;;
+
 ttyU[0-9a-zA-Z])
 	U=${i#ttyU*}
 	o=$(alph2d $U)
@@ -328,11 +333,6 @@ 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 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
-	;;
-
 wsmouse[0-9]*)
 	M wsmouse$U c 27 $U 600
 	;;
@@ -346,6 +346,16 @@ wskbd[0-9]*)
 	M wskbd$U c 26 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyFcfg ttyF0 ttyF1 ttyF2 ttyF3 ttyF4 ttyF5
+	R ttyF6 ttyF7 ttyF8 ttyF9 ttyFa ttyFb ttyEcfg ttyE0 ttyE1
+	R ttyE2 ttyE3 ttyE4 ttyE5 ttyE6 ttyE7 ttyE8 ttyE9 ttyEa ttyEb
+	R ttyDcfg ttyD0 ttyD1 ttyD2 ttyD3 ttyD4 ttyD5 ttyD6 ttyD7
+	R ttyD8 ttyD9 ttyDa ttyDb ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3
+	R ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -365,16 +375,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyFcfg ttyF0 ttyF1 ttyF2 ttyF3 ttyF4 ttyF5
-	R ttyF6 ttyF7 ttyF8 ttyF9 ttyFa ttyFb ttyEcfg ttyE0 ttyE1
-	R ttyE2 ttyE3 ttyE4 ttyE5 ttyE6 ttyE7 ttyE8 ttyE9 ttyEa ttyEb
-	R ttyDcfg ttyD0 ttyD1 ttyD2 ttyD3 ttyD4 ttyD5 ttyD6 ttyD7
-	R ttyD8 ttyD9 ttyDa ttyDb ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3
-	R ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.socppc/MAKEDEV b/etc/etc.socppc/MAKEDEV
index 887ea4458de..5fa3680f1b8 100644
--- a/etc/etc.socppc/MAKEDEV
+++ b/etc/etc.socppc/MAKEDEV
@@ -47,15 +47,15 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
 #	wsmouse*	wscons mice
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -69,11 +69,13 @@
 #	bpf*	Berkeley Packet Filter
 #	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
-#	hotplug	devices hot plugging
 #	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
 #	radio*	FM tuner devices
@@ -82,9 +84,7 @@
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -225,18 +225,10 @@ std)
 	;;
 
 
-diskmap)
-	M diskmap c 82 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 78 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 44 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -277,6 +269,10 @@ 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
 	;;
@@ -285,20 +281,24 @@ iop*)
 	M iop$U c 73 $U 660
 	;;
 
-gpio*)
-	M gpio$U c 79 $U 600
-	;;
-
 hotplug)
 	M hotplug c 78 $U 400
 	;;
 
+gpio*)
+	M gpio$U c 79 $U 600
+	;;
+
 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
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 82 0 640 operator
+	;;
+
 crypto)
 	M crypto c 47 0
 	;;
@@ -360,6 +360,12 @@ 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)
@@ -367,12 +373,6 @@ 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
 	;;
@@ -386,6 +386,12 @@ wskbd[0-9]*)
 	M wskbd$U c 68 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -405,12 +411,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index c1b69750632..e4eb97e1da5 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -45,21 +45,21 @@
 #	st*	SCSI tape drives
 # Terminal ports:
 #	cua[a-z]*	Zilog 8530 serial ports
-#	tty[a-z]*	Zilog 8530 serial ports
-#	tty[0-7][0-9a-f]	NS16x50 serial ports
 #	magma*	Magma multiport cards
 #	spif*	"spif" multiport cards
+#	tty[0-7][0-9a-f]	NS16x50 serial ports
+#	tty[a-z]*	Zilog 8530 serial ports
 # Pseudo terminals:
 #	ptm	pty master device
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Printers:
 #	bpp*	Parallel port
-#	bppmag[mno]	Magma parallel port
 #	bpp[jkl]	"spif" parallel port
+#	bppmag[mno]	Magma parallel port
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
@@ -69,17 +69,17 @@
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	openprom	PROM settings
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -226,18 +226,10 @@ std)
 	M openprom	c 70 0	640 kmem
 	;;
 
-diskmap)
-	M diskmap c 129 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 128 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 uk*)
 	M uk$U c 120 $U 640 operator
 	;;
@@ -267,6 +259,10 @@ openprom)
 	M openprom c 70 0  
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 lkm)
 	M lkm c 112 0 640 _lkm
 	;;
@@ -277,6 +273,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 129 0 640 operator
+	;;
+
 bpf*)
 	M bpf$U c 105 $U 600
 	;;
@@ -314,6 +314,20 @@ wskbd[0-9]*)
 	M wskbd$U c 79 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyIcfg ttyI0 ttyI1 ttyI2 ttyI3 ttyI4 ttyI5
+	R ttyI6 ttyI7 ttyI8 ttyI9 ttyIa ttyIb ttyHcfg ttyH0 ttyH1
+	R ttyH2 ttyH3 ttyH4 ttyH5 ttyH6 ttyH7 ttyH8 ttyH9 ttyHa ttyHb
+	R ttyGcfg ttyG0 ttyG1 ttyG2 ttyG3 ttyG4 ttyG5 ttyG6 ttyG7
+	R ttyG8 ttyG9 ttyGa ttyGb ttyFcfg ttyF0 ttyF1 ttyF2 ttyF3
+	R ttyF4 ttyF5 ttyF6 ttyF7 ttyF8 ttyF9 ttyFa ttyFb ttyEcfg
+	R ttyE0 ttyE1 ttyE2 ttyE3 ttyE4 ttyE5 ttyE6 ttyE7 ttyE8 ttyE9
+	R ttyEa ttyEb ttyDcfg ttyD0 ttyD1 ttyD2 ttyD3 ttyD4 ttyD5
+	R ttyD6 ttyD7 ttyD8 ttyD9 ttyDa ttyDb ttyCcfg ttyC0 ttyC1
+	R ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -333,20 +347,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyIcfg ttyI0 ttyI1 ttyI2 ttyI3 ttyI4 ttyI5
-	R ttyI6 ttyI7 ttyI8 ttyI9 ttyIa ttyIb ttyHcfg ttyH0 ttyH1
-	R ttyH2 ttyH3 ttyH4 ttyH5 ttyH6 ttyH7 ttyH8 ttyH9 ttyHa ttyHb
-	R ttyGcfg ttyG0 ttyG1 ttyG2 ttyG3 ttyG4 ttyG5 ttyG6 ttyG7
-	R ttyG8 ttyG9 ttyGa ttyGb ttyFcfg ttyF0 ttyF1 ttyF2 ttyF3
-	R ttyF4 ttyF5 ttyF6 ttyF7 ttyF8 ttyF9 ttyFa ttyFb ttyEcfg
-	R ttyE0 ttyE1 ttyE2 ttyE3 ttyE4 ttyE5 ttyE6 ttyE7 ttyE8 ttyE9
-	R ttyEa ttyEb ttyDcfg ttyD0 ttyD1 ttyD2 ttyD3 ttyD4 ttyD5
-	R ttyD6 ttyD7 ttyD8 ttyD9 ttyDa ttyDb ttyCcfg ttyC0 ttyC1
-	R ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 bpp*)
 	M bpp$U c 104 $U 600
 	;;
@@ -377,6 +377,27 @@ ptm)
 	M ptm c 125 0 666
 	;;
 
+tty[a-z])
+	u=${i#tty*}
+	case $u in
+	a) n=0 ;;
+	b) n=1 ;;
+	c) n=2 ;;
+	d) n=3 ;;
+	e) n=4;;
+	f) n=5;;
+	*) echo unknown tty device $i ;;
+	esac
+	M tty$u c 12 $n 660 dialer uucp
+	;;
+
+tty[0-7][0-9a-f])
+	U=${i#tty*}
+	o=$(h2d $U)
+	M tty$U c 36 $o 660 dialer uucp
+	M cua$U c 36 $(($o+128)) 660 dialer uucp
+	;;
+
 spif*)
 	case $U in
 	0)	offset=0  nam=j;;
@@ -414,27 +435,6 @@ magma*)
 	M bpp${nam}1 c 101 $(($offset+1)) 600
 	;;
 
-tty[0-7][0-9a-f])
-	U=${i#tty*}
-	o=$(h2d $U)
-	M tty$U c 36 $o 660 dialer uucp
-	M cua$U c 36 $(($o+128)) 660 dialer uucp
-	;;
-
-tty[a-z])
-	u=${i#tty*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	c) n=2 ;;
-	d) n=3 ;;
-	e) n=4;;
-	f) n=5;;
-	*) echo unknown tty device $i ;;
-	esac
-	M tty$u c 12 $n 660 dialer uucp
-	;;
-
 cua[a-z])
 	u=${i#cua*}
 	case $u in
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 11de97edfe5..f2c938cee18 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -42,10 +42,11 @@
 #	ch*	SCSI media changers
 #	st*	SCSI tape drives
 # Terminal ports:
-#	tty[0-7][0-9a-f]	NS16x50 serial ports
 #	cua[a-z]*	Zilog 8530 serial port
-#	tty[a-z]*	Zilog 8530 serial port
+#	magma*	Magma multiport cards
 #	spif*	"spif" multiport cards
+#	tty[0-7][0-9a-f]	NS16x50 serial ports
+#	tty[a-z]*	Zilog 8530 serial port
 #	ttyh*	Sab82532 serial devices
 #	ttyV*	virtual console concentrator
 # Pseudo terminals:
@@ -54,21 +55,21 @@
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
 #	console	PROM console
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
 #	wsmouse*	wscons mice
 # Printers:
 #	bpp*	Parallel port
-#	bppmag[mno]	Magma parallel port
 #	bpp[jkl]	"spif" parallel port
+#	bppmag[mno]	Magma parallel port
 #	lpa*	Polled printer port
 #	lpt*	IEEE 1284 centronics printer
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -79,12 +80,14 @@
 #	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
 #	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	openprom	PROM settings
-#	magma*	Magma multiport cards
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
@@ -93,10 +96,7 @@
 #	uk*	Unknown SCSI devices
 #	uperf	Performance counters
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	bthub*	Bluetooth Hubs
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -243,22 +243,10 @@ std)
 	M mdesc		c 70 1 640 kmem
 	;;
 
-diskmap)
-	M diskmap c 130 0 640 operator
-	;;
-
-bthub*)
-	M bthub$U c 129 $U
-	;;
-
 vscsi*)
 	M vscsi$U c 128 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 44 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
@@ -298,29 +286,14 @@ pci*)
 	MKlist[${#MKlist[*]}]=";[ -h pci ] || ln -sf pci0 pci"
 	;;
 
-magma*)
-	case $U in
-	0)	offset=0  nam=m;;
-	1)	offset=16 nam=n;;
-	2)	offset=32 nam=o;;
-	*)	echo "bad unit for $i: $U"; exit 127;;
-	esac
-	offset=$(($U*64))
-	n=0
-	while [ $n -lt 16 ]
-	do
-		name=${nam}`hex $n`
-		M tty$name c 71 $(($offset+$n)) 660 dialer uucp
-		n=$(($n+1))
-	done
-	M bpp${nam}0 c 72 $(($offset+0)) 600
-	M bpp${nam}1 c 72 $(($offset+1)) 600
-	;;
-
 openprom)
 	M openprom c 70 0  
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 lkm)
 	M lkm c 112 0 640 _lkm
 	;;
@@ -335,10 +308,18 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 130 0 640 operator
+	;;
+
 crypto)
 	M crypto c 75 0
 	;;
 
+bthub*)
+	M bthub$U c 129 $U
+	;;
+
 bpf*)
 	M bpf$U c 105 $U 600
 	;;
@@ -387,6 +368,12 @@ 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)
@@ -394,12 +381,6 @@ ttyU[0-9a-zA-Z])
 	M cuaU$U c 95 $(($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
-	;;
-
 lpt*|lpa*)
 	case $i in
 	lpt*) n=lpt f=0;;
@@ -425,6 +406,22 @@ wskbd[0-9]*)
 	M wskbd$U c 79 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyJcfg ttyJ0 ttyJ1 ttyJ2 ttyJ3 ttyJ4 ttyJ5
+	R ttyJ6 ttyJ7 ttyJ8 ttyJ9 ttyJa ttyJb ttyIcfg ttyI0 ttyI1
+	R ttyI2 ttyI3 ttyI4 ttyI5 ttyI6 ttyI7 ttyI8 ttyI9 ttyIa ttyIb
+	R ttyHcfg ttyH0 ttyH1 ttyH2 ttyH3 ttyH4 ttyH5 ttyH6 ttyH7
+	R ttyH8 ttyH9 ttyHa ttyHb ttyGcfg ttyG0 ttyG1 ttyG2 ttyG3
+	R ttyG4 ttyG5 ttyG6 ttyG7 ttyG8 ttyG9 ttyGa ttyGb ttyFcfg
+	R ttyF0 ttyF1 ttyF2 ttyF3 ttyF4 ttyF5 ttyF6 ttyF7 ttyF8 ttyF9
+	R ttyFa ttyFb ttyEcfg ttyE0 ttyE1 ttyE2 ttyE3 ttyE4 ttyE5
+	R ttyE6 ttyE7 ttyE8 ttyE9 ttyEa ttyEb ttyDcfg ttyD0 ttyD1
+	R ttyD2 ttyD3 ttyD4 ttyD5 ttyD6 ttyD7 ttyD8 ttyD9 ttyDa ttyDb
+	R ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7
+	R ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -444,22 +441,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyJcfg ttyJ0 ttyJ1 ttyJ2 ttyJ3 ttyJ4 ttyJ5
-	R ttyJ6 ttyJ7 ttyJ8 ttyJ9 ttyJa ttyJb ttyIcfg ttyI0 ttyI1
-	R ttyI2 ttyI3 ttyI4 ttyI5 ttyI6 ttyI7 ttyI8 ttyI9 ttyIa ttyIb
-	R ttyHcfg ttyH0 ttyH1 ttyH2 ttyH3 ttyH4 ttyH5 ttyH6 ttyH7
-	R ttyH8 ttyH9 ttyHa ttyHb ttyGcfg ttyG0 ttyG1 ttyG2 ttyG3
-	R ttyG4 ttyG5 ttyG6 ttyG7 ttyG8 ttyG9 ttyGa ttyGb ttyFcfg
-	R ttyF0 ttyF1 ttyF2 ttyF3 ttyF4 ttyF5 ttyF6 ttyF7 ttyF8 ttyF9
-	R ttyFa ttyFb ttyEcfg ttyE0 ttyE1 ttyE2 ttyE3 ttyE4 ttyE5
-	R ttyE6 ttyE7 ttyE8 ttyE9 ttyEa ttyEb ttyDcfg ttyD0 ttyD1
-	R ttyD2 ttyD3 ttyD4 ttyD5 ttyD6 ttyD7 ttyD8 ttyD9 ttyDa ttyDb
-	R ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6 ttyC7
-	R ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
@@ -496,6 +477,25 @@ ttyh*)
 	M ttyh$U c 77 $U 660 dialer uucp
 	;;
 
+tty[a-z])
+	u=${i#tty*}
+	case $u in
+	a) n=0 ;;
+	b) n=1 ;;
+	c) n=2 ;;
+	d) n=3 ;;
+	*) echo unknown tty device $i ;;
+	esac
+	M tty$u c 12 $n 660 dialer uucp
+	;;
+
+tty[0-7][0-9a-f])
+	U=${i#tty*}
+	o=$(h2d $U)
+	M tty$U c 36 $o 660 dialer uucp
+	M cua$U c 36 $(($o+128)) 660 dialer uucp
+	;;
+
 spif*)
 	case $U in
 	0)	offset=0  nam=j;;
@@ -514,16 +514,23 @@ spif*)
 	M bpp${nam}0 c 109 $(($offset+0)) 600
 	;;
 
-tty[a-z])
-	u=${i#tty*}
-	case $u in
-	a) n=0 ;;
-	b) n=1 ;;
-	c) n=2 ;;
-	d) n=3 ;;
-	*) echo unknown tty device $i ;;
+magma*)
+	case $U in
+	0)	offset=0  nam=m;;
+	1)	offset=16 nam=n;;
+	2)	offset=32 nam=o;;
+	*)	echo "bad unit for $i: $U"; exit 127;;
 	esac
-	M tty$u c 12 $n 660 dialer uucp
+	offset=$(($U*64))
+	n=0
+	while [ $n -lt 16 ]
+	do
+		name=${nam}`hex $n`
+		M tty$name c 71 $(($offset+$n)) 660 dialer uucp
+		n=$(($n+1))
+	done
+	M bpp${nam}0 c 72 $(($offset+0)) 600
+	M bpp${nam}1 c 72 $(($offset+1)) 600
 	;;
 
 cua[a-z])
@@ -538,13 +545,6 @@ cua[a-z])
 	M cua$u c 12 $(($n+128)) 660 dialer uucp
 	;;
 
-tty[0-7][0-9a-f])
-	U=${i#tty*}
-	o=$(h2d $U)
-	M tty$U c 36 $o 660 dialer uucp
-	M cua$U c 36 $(($o+128)) 660 dialer uucp
-	;;
-
 st*)
 	n=$(($U*16))
 	for pre in " " n e en
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index fcfe231ba94..bc4d8dc9f79 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -33,8 +33,8 @@
 #	ccd*	Concatenated disk devices
 #	cd*	ATAPI and SCSI CD-ROM drives
 #	fd*	Floppy disk drives (3 1/2", 5 1/4")
-#	hk*	UNIBUS RK06 and RK07 disks
 #	hd*	HDC9224 disks
+#	hk*	UNIBUS RK06 and RK07 disks
 #	hp*	MASSBUS disks
 #	ra*	MSCP disks
 #	raid*	RAIDframe disk devices
@@ -63,24 +63,24 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 # Pointing devices:
 #	wsmouse*	wscons mice
 # Special purpose devices:
 #	bio	ioctl tunnel pseudo-device
 #	bpf*	Berkeley Packet Filter
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
 #	lkm	Loadable kernel modules interface
+#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -274,18 +274,10 @@ ht*|tm*|mt*|ts*|ut*)
 	umask 77
 	;;
 
-diskmap)
-	M diskmap c 79 0 640 operator
-	;;
-
 vscsi*)
 	M vscsi$U c 78 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 74 $U 600
-	;;
-
 uk*)
 	M uk$U c 65 $U 640 operator
 	;;
@@ -311,6 +303,10 @@ pf*)
 	M pf c 42 0 600
 	;;
 
+nnpfs*)
+	M nnpfs$U c 74 $U 600
+	;;
+
 lkm)
 	M lkm c 28 0 640 _lkm
 	;;
@@ -321,6 +317,10 @@ fd)
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 79 0 640 operator
+	;;
+
 bpf*)
 	M bpf$U c 56 $U 600
 	;;
@@ -337,6 +337,12 @@ wskbd[0-9]*)
 	M wskbd$U c 69 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6
+	R ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -356,12 +362,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5 ttyC6
-	R ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i
diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV
index 9363e9b09f9..858968926b1 100644
--- a/etc/etc.zaurus/MAKEDEV
+++ b/etc/etc.zaurus/MAKEDEV
@@ -47,14 +47,14 @@
 #	pty*	Set of 62 master pseudo terminals
 #	tty*	Set of 62 slave pseudo terminals
 # Console ports:
-#	wscons	Minimal wscons devices
 #	ttyC-J*	wscons display devices
+#	wscons	Minimal wscons devices
 #	wskbd*	wscons keyboards
 #	wsmouse*	wscons mice
 #	wsmux	wscons keyboard/mouse mux devices
 # USB devices:
-#	uall	All USB devices
 #	ttyU*	USB serial ports
+#	uall	All USB devices
 #	ugen*	Generic USB devices
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
@@ -64,27 +64,27 @@
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
-#	hotplug	devices hot plugging
 #	bio	ioctl tunnel pseudo-device
 #	bktr*	Video frame grabbers
 #	bpf*	Berkeley Packet Filter
+#	bthub*	Bluetooth Hubs
 #	crypto	Hardware crypto access driver
+#	diskmap	Disk mapper
 #	fd	fd/* nodes
+#	hotplug	devices hot plugging
 #	lkm	Loadable kernel modules interface
 #	music*	MIDI sequencer
+#	nnpfs*	NNPFS filesystem node
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
-#	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
-#	tun*	Network tunnel driver
-#	uk*	Unknown SCSI devices
+#	rmidi*	Raw MIDI devices
 #	systrace*	System call tracing device
+#	tun*	Network tunnel driver
 #	tuner*	Tuner devices
+#	uk*	Unknown SCSI devices
 #	video*	Video V4L2 devices
-#	nnpfs*	NNPFS filesystem node
 #	vscsi*	Virtual SCSI controller
-#	bthub*	Bluetooth Hubs
-#	diskmap	Disk mapper
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
 
@@ -229,41 +229,33 @@ std)
 	M klog		c 6 0 600
 	;;
 
-diskmap)
-	M diskmap c 102 0 640 operator
-	;;
-
-bthub*)
-	M bthub$U c 101 $U
-	;;
-
 vscsi*)
 	M vscsi$U c 100 $U 600
 	;;
 
-nnpfs*)
-	M nnpfs$U c 51 $U 600
-	;;
-
 video*)
 	M video$U  c 38 $U
 	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
 	;;
 
+uk*)
+	M uk$U c 28 $U 640 operator
+	;;
+
 tuner*)
 	M tuner$U c 75 $(($(($U*2))+16)) 644
 	;;
 
-systrace)
-	M systrace c 50 0 644
+tun*)
+	M tun$U c 33 $U 600
 	;;
 
-uk*)
-	M uk$U c 28 $U 640 operator
+systrace)
+	M systrace c 50 0 644
 	;;
 
-tun*)
-	M tun$U c 33 $U 600
+rmidi*)
+	M rmidi$U c 57 $U 666
 	;;
 
 *random)
@@ -275,10 +267,6 @@ tun*)
 	done
 	;;
 
-rmidi*)
-	M rmidi$U c 57 $U 666
-	;;
-
 radio*)
 	M radio$U     c 97 $U
 	MKlist[${#MKlist[*]}]=";[ -e radio ] || ln -s radio$U radio"
@@ -288,6 +276,10 @@ pf*)
 	M pf c 46 0 600
 	;;
 
+nnpfs*)
+	M nnpfs$U c 51 $U 600
+	;;
+
 music*)
 	M music$U     c 58 $U
 	M sequencer$U c 58 $(($U+128))
@@ -299,16 +291,28 @@ lkm)
 	M lkm c 35 0 640 _lkm
 	;;
 
+hotplug)
+	M hotplug c 37 $U 400
+	;;
+
 fd)
 	RMlist[${#RMlist[*]}]=";mkdir -p fd;rm -f" n=0
 	while [ $n -lt 64 ];do M fd/$n c 7 $n;n=$(($n+1));done
 	MKlist[${#MKlist[*]}]=";chmod 555 fd"
 	;;
 
+diskmap)
+	M diskmap c 102 0 640 operator
+	;;
+
 crypto)
 	M crypto c 47 0
 	;;
 
+bthub*)
+	M bthub$U c 101 $U
+	;;
+
 bpf*)
 	M bpf$U c 22 $U 600
 	;;
@@ -321,10 +325,6 @@ bio)
 	M bio c 52 0 600
 	;;
 
-hotplug)
-	M hotplug c 37 $U 400
-	;;
-
 audio*)
 	M sound$U	c 36 $U
 	M mixer$U	c 36 $(($U+16))
@@ -370,6 +370,12 @@ 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)
@@ -377,12 +383,6 @@ ttyU[0-9a-zA-Z])
 	M cuaU$U c 68 $(($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
-	;;
-
 wsmux|wsmouse|wskbd)
 	M wsmouse c 63 0 600
 	M wskbd c 63 1 600
@@ -396,6 +396,12 @@ wskbd[0-9]*)
 	M wskbd$U c 61 $U 600
 	;;
 
+wscons)
+	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
+	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
+	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
+	;;
+
 tty[C-J]*)
 	U=${i##tty[C-J]}
 	case $i in
@@ -415,12 +421,6 @@ tty[C-J]*)
 	esac
 	;;
 
-wscons)
-	R wsmouse0 wsmouse1 wsmouse2 wsmouse3 wskbd0 wskbd1 wskbd2
-	R wskbd3 wsmux ttyCcfg ttyC0 ttyC1 ttyC2 ttyC3 ttyC4 ttyC5
-	R ttyC6 ttyC7 ttyC8 ttyC9 ttyCa ttyCb
-	;;
-
 pty*)
 	if [ $U -gt 15 ]; then
 		echo bad unit for pty in: $i