Regen.

22 files changed, 177 insertions, 379 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 9b7d7666f55..36c19490ba1 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.47 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.48 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -83,7 +83,6 @@
 #	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
 #	speaker	PC speaker
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	tuner*	Tuner devices
@@ -285,14 +284,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 32 $(($U*16)) 640 operator
-	M nss$U c 32 $(($(($U*16))+1)) 640 operator
-	M enss$U c 32 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 speaker)
 	M speaker c 40 0 600
 	;;
@@ -554,15 +545,14 @@ all)
 	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 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0
-	R fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ss0
-	R ss1 ch0 bio hotplug ptm local wscons pci0 pci1 pci2 pci3
-	R iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 tuner0 radio0 music0 speaker video0 audio0
-	R audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm
-	R tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5
-	R ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 crypto pf
-	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
-	R fd
+	R fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0
+	R bio hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1
+	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R tuner0 radio0 music0 speaker video0 audio0 audio1 audio2 uk0
+	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
+	R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0
+	R ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2
+	R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index 5632bdd0975..ab6d0d4ac91 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.40 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.41 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -92,7 +92,6 @@
 #	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
 #	speaker	PC speaker
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	tuner*	Tuner devices
@@ -284,14 +283,6 @@ systrace)
 	M systrace c 78 0 644
 	;;
 
-ss*)
-	M ss$U c 19 $(($U*16)) 640 operator
-	M nss$U c 19 $(($(($U*16))+1)) 640 operator
-	M enss$U c 19 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 speaker)
 	M speaker c 27 0 600
 	;;
@@ -596,14 +587,14 @@ all)
 	R sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3
 	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0
 	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
-	R fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ss0 ss1 ch0
-	R hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1
-	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R tuner0 radio0 music0 speaker video0 audio0 audio1 audio2 uk0
-	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
-	R tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm
-	R crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
-	R raid3 std st0 st1 fd
+	R fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 hotplug ptm
+	R gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+	R radio0 music0 speaker video0 audio0 audio1 audio2 uk0 random
+	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
+	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto
+	R pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std
+	R st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.armish/MAKEDEV b/etc/etc.armish/MAKEDEV
index 64b107e1f9d..c102f1b1072 100644
--- a/etc/etc.armish/MAKEDEV
+++ b/etc/etc.armish/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.armish/MAKEDEV.md,v 1.18 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.armish/MAKEDEV.md,v 1.19 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -80,7 +80,6 @@
 #	*random	In-kernel random data source
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
@@ -261,14 +260,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 29 $(($U*16)) 640 operator
-	M nss$U c 29 $(($(($U*16))+1)) 640 operator
-	M enss$U c 29 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 uk*)
 	M uk$U c 28 $U 640 operator
 	;;
@@ -508,12 +499,12 @@ all)
 	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 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ss0 ss1 ch0
-	R hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall
-	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
-	R tuner0 radio0 music0 video0 audio0 audio1 audio2 uk0 random
-	R lkm tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1
-	R wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+	R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 hotplug ptm
+	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
+	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+	R radio0 music0 video0 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
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.aviion/MAKEDEV b/etc/etc.aviion/MAKEDEV
index e57c608f523..84d467ed75c 100644
--- a/etc/etc.aviion/MAKEDEV
+++ b/etc/etc.aviion/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.10 2010/06/09 16:10:25 todd Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.aviion/MAKEDEV.md,v 1.11 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -52,7 +52,6 @@
 #	nvram0	On-board non-volatile memory
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -223,14 +222,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 42 $(($U*16)) 640 operator
-	M nss$U c 42 $(($(($U*16))+1)) 640 operator
-	M enss$U c 42 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -348,7 +339,7 @@ all)
 	R ttya ttyb ttyc ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0
 	R sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
-	R vscsi0 nnpfs0 ss0 ch0 nvram0 ptm local uk0 random lkm pf
+	R vscsi0 nnpfs0 ch0 nvram0 ptm local uk0 random lkm pf
 	R systrace std st0 st1 fd
 	;;
 
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 7a079d815a8..fcbaa857134 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.38 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.hp300/MAKEDEV.md,v 1.39 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -65,7 +65,6 @@
 #	lkm	Loadable kernel modules interface
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -303,14 +302,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 38 $(($U*16)) 640 operator
-	M nss$U c 38 $(($(($U*16))+1)) 640 operator
-	M enss$U c 38 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -464,9 +455,8 @@ 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 ss0 ch0 ptm
-	R local ppi0 apci0 wscons uk0 random lkm pf systrace std st0
-	R st1 fd
+	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
 	;;
 
 sd*|hd*|ccd*)
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 51ccb7f2821..d8315d340e9 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.42 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.43 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -76,7 +76,6 @@
 #	pdc	PDC device
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -263,14 +262,6 @@ systrace)
 	M systrace c 34 0 644
 	;;
 
-ss*)
-	M ss$U c 14 $(($U*16)) 640 operator
-	M nss$U c 14 $(($(($U*16))+1)) 640 operator
-	M enss$U c 14 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -512,11 +503,11 @@ all)
 	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 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0
-	R fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ss0
-	R ss1 bio ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3
-	R uall video0 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2
-	R lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf
-	R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R fd0B fd0C fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 bio
+	R ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall video0
+	R audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1
+	R lpt2 lkm tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1
+	R wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index 5a287b9810a..ec6dc8b4a55 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.18 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.19 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -67,7 +67,6 @@
 #	pdc	PDC device
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -249,14 +248,6 @@ systrace)
 	M systrace c 34 0 644
 	;;
 
-ss*)
-	M ss$U c 14 $(($U*16)) 640 operator
-	M nss$U c 14 $(($(($U*16))+1)) 640 operator
-	M enss$U c 14 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -453,10 +444,10 @@ all)
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
 	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 ss0 ss1 ch0 ptm local wscons
-	R pci0 pci1 pci2 pci3 video0 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 fd0G fd0H diskmap vscsi0 nnpfs0 ch0 ptm local wscons pci0
+	R pci1 pci2 pci3 video0 audio0 audio1 audio2 uk0 random lpa0
+	R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto
+	R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 6721a4e8306..19fc9eaa79c 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.55 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.56 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -95,7 +95,6 @@
 #	rmidi*	Raw MIDI devices
 #	*random	In-kernel random data source
 #	speaker	PC speaker
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	tuner*	Tuner devices
@@ -287,14 +286,6 @@ systrace)
 	M systrace c 78 0 644
 	;;
 
-ss*)
-	M ss$U c 19 $(($U*16)) 640 operator
-	M nss$U c 19 $(($(($U*16))+1)) 640 operator
-	M enss$U c 19 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 speaker)
 	M speaker c 27 0 600
 	;;
@@ -611,9 +602,9 @@ all)
 	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2
 	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C
-	R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ss0 ss1 ch0
-	R hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1
-	R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+	R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 hotplug
+	R ptm gpr0 local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall
+	R rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
 	R tuner0 radio0 music0 speaker video0 audio0 audio1 audio2 uk0
 	R random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
 	R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index 385fc9cf01d..5d48f512c61 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.20 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.21 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -77,7 +77,6 @@
 #	*random	In-kernel random data source
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	video*	Video V4L2 devices
 #	nnpfs*	NNPFS filesystem node
@@ -253,14 +252,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 29 $(($U*16)) 640 operator
-	M nss$U c 29 $(($(($U*16))+1)) 640 operator
-	M enss$U c 29 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 uk*)
 	M uk$U c 28 $U 640 operator
 	;;
@@ -484,10 +475,10 @@ all)
 	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 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ss0 ss1 ch0 ttya
-	R hotplug ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0
-	R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0
-	R music0 video0 audio0 audio1 audio2 uk0 random lkm crypto pf
+	R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 ttya hotplug
+	R ptm local wscons pci0 pci1 pci2 pci3 uall rmidi0 rmidi1
+	R rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 radio0 music0
+	R video0 audio0 audio1 audio2 uk0 random lkm crypto pf
 	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
 	R fd
 	;;
diff --git a/etc/etc.loongson/MAKEDEV b/etc/etc.loongson/MAKEDEV
index d0da0409d42..35b76449fe0 100644
--- a/etc/etc.loongson/MAKEDEV
+++ b/etc/etc.loongson/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.6 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.loongson/MAKEDEV.md,v 1.7 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -71,7 +71,6 @@
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -252,14 +251,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 34 $(($U*16)) 640 operator
-	M nss$U c 34 $(($(($U*16))+1)) 640 operator
-	M enss$U c 34 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
diff --git a/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index ba37a529652..fe8a85494f7 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.14 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.luna88k/MAKEDEV.md,v 1.15 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -59,7 +59,6 @@
 #	lkm	Loadable kernel modules interface
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -230,14 +229,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 42 $(($U*16)) 640 operator
-	M nss$U c 42 $(($(($U*16))+1)) 640 operator
-	M enss$U c 42 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -382,8 +373,8 @@ all)
 	R lcd ttya ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1
 	R sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1
 	R bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0
-	R nnpfs0 ss0 ch0 ptm local wscons uk0 random lkm pf systrace
-	R std st0 st1 fd
+	R nnpfs0 ch0 ptm local wscons uk0 random lkm pf systrace std
+	R st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index 30d033cb56d..66e7cbdd074 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.32 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.mac68k/MAKEDEV.md,v 1.33 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -59,7 +59,6 @@
 #	lkm	Loadable kernel modules interface
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -255,14 +254,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 33 $(($U*16)) 640 operator
-	M nss$U c 33 $(($(($U*16))+1)) 640 operator
-	M enss$U c 33 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -401,9 +392,9 @@ ramdisk)
 all)
 	R ccd0 ccd1 ccd2 ccd3 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap
-	R vscsi0 nnpfs0 ss0 ss1 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2
-	R sd3 sd4 bio ptm local wscons asc0 uk0 random lkm tty00 tty01
-	R pf systrace std st0 st1 fd
+	R vscsi0 nnpfs0 ch0 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
+	R bio ptm local wscons asc0 uk0 random lkm tty00 tty01 pf
+	R systrace std st0 st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index b5980c3ce63..33170b8a090 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.42 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.43 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -81,7 +81,6 @@
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	tuner*	Tuner devices
@@ -265,14 +264,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 42 $(($U*16)) 640 operator
-	M nss$U c 42 $(($(($U*16))+1)) 640 operator
-	M enss$U c 42 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -526,12 +517,11 @@ 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 ss0 ss1
-	R ch0 cuaa cuab ttya ttyb hotplug ptm local wscons pci0 pci1
-	R pci2 pci3 iop0 iop1 uall tuner0 radio0 video0 audio0 audio1
-	R audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm crypto pf
-	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
-	R fd
+	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 cuaa
+	R cuab ttya ttyb hotplug ptm local wscons pci0 pci1 pci2 pci3
+	R iop0 iop1 uall tuner0 radio0 video0 audio0 audio1 audio2 uk0
+	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
+	R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index fc834dd9150..31e01f88e16 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.27 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.28 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -60,7 +60,6 @@
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	sram0	On-board static memory
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -241,14 +240,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 42 $(($U*16)) 640 operator
-	M nss$U c 42 $(($(($U*16))+1)) 640 operator
-	M enss$U c 42 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 sram0)
 	M sram0 c 7 0 640 kmem
 	;;
@@ -432,9 +423,9 @@ all)
 	R cuaa cuab cuac cuad ttya ttyb ttyc ttyd ccd0 ccd1 ccd2 ccd3
 	R vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0
 	R tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
-	R bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ss0 ss1 ch0 vmel0 vmes0
-	R flash0 nvram0 sram0 ptm local uk0 random lkm pf systrace std
-	R st0 st1 fd
+	R bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 vmel0 vmes0 flash0
+	R nvram0 sram0 ptm local uk0 random lkm pf systrace std st0
+	R st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index 2b6bddb6cc5..8d2c780518d 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.26 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.27 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -55,7 +55,6 @@
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
 #	sram0	On-board static memory
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	vmel0	VMEbus D32 space
@@ -236,14 +235,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 42 $(($U*16)) 640 operator
-	M nss$U c 42 $(($(($U*16))+1)) 640 operator
-	M enss$U c 42 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 sram0)
 	M sram0 c 7 0 640 kmem
 	;;
@@ -387,9 +378,9 @@ all)
 	R tty02 tty03 tty04 tty05 tty06 tty07 ttya ttyb ccd0 ccd1 ccd2
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0
 	R tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ss0 ch0 vmel0
-	R vmes0 nvram0 sram0 ptm local uk0 random lkm pf systrace std
-	R st0 st1 fd
+	R bpf7 bpf8 bpf9 pty0 diskmap vscsi0 nnpfs0 ch0 vmel0 vmes0
+	R nvram0 sram0 ptm local uk0 random lkm pf systrace std st0
+	R st1 fd
 	;;
 
 sd*|ccd*)
diff --git a/etc/etc.palm/MAKEDEV b/etc/etc.palm/MAKEDEV
index 6d44540a7b4..4a0b34ebc38 100644
--- a/etc/etc.palm/MAKEDEV
+++ b/etc/etc.palm/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.palm/MAKEDEV.md,v 1.5 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.palm/MAKEDEV.md,v 1.6 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -78,7 +78,6 @@
 #	*random	In-kernel random data source
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
@@ -259,14 +258,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 29 $(($U*16)) 640 operator
-	M nss$U c 29 $(($(($U*16))+1)) 640 operator
-	M enss$U c 29 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 uk*)
 	M uk$U c 28 $U 640 operator
 	;;
@@ -497,12 +488,11 @@ all)
 	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 bio vscsi0 nnpfs0 ss0 ss1 ch0 hotplug ptm
-	R local wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 tuner0 radio0 music0 video0 audio0 audio1
-	R audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm crypto pf
-	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
-	R fd
+	R bpf8 bpf9 pty0 bio vscsi0 nnpfs0 ch0 hotplug ptm local
+	R wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+	R rmidi7 tuner0 radio0 music0 video0 audio0 audio1 audio2 uk0
+	R random lkm tty00 tty01 tty02 tty03 apm crypto pf systrace
+	R wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index 01a9b735450..8113fd145b0 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.29 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.30 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -70,7 +70,6 @@
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -246,14 +245,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 34 $(($U*16)) 640 operator
-	M nss$U c 34 $(($(($U*16))+1)) 640 operator
-	M enss$U c 34 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -457,10 +448,10 @@ all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0
 	R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2
-	R diskmap vscsi0 nnpfs0 ss0 ss1 ch0 hotplug ptm local wscons
-	R pci0 pci1 pci2 pci3 uall video0 audio0 audio1 audio2 uk0
-	R random tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1
-	R wd2 wd3 std st0 st1 fd
+	R diskmap vscsi0 nnpfs0 ch0 hotplug ptm local wscons pci0 pci1
+	R pci2 pci3 uall video0 audio0 audio1 audio2 uk0 random tty00
+	R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0
+	R st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.socppc/MAKEDEV b/etc/etc.socppc/MAKEDEV
index f9b0a670dc0..ae64042804c 100644
--- a/etc/etc.socppc/MAKEDEV
+++ b/etc/etc.socppc/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.9 2010/06/09 16:10:25 todd Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.10 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -78,7 +78,6 @@
 #	pf*	Packet Filter
 #	radio*	FM tuner devices
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -255,14 +254,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 42 $(($U*16)) 640 operator
-	M nss$U c 42 $(($(($U*16))+1)) 640 operator
-	M enss$U c 42 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -492,9 +483,9 @@ 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 ss0 ss1
-	R ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1
-	R uall radio0 video0 audio0 audio1 audio2 uk0 random lkm tty00
+	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 audio0 audio1 audio2 uk0 random lkm tty00
 	R tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2 wd3
 	R raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 9643ba61ce6..ea7dbf31393 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.42 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.sparc/MAKEDEV.md,v 1.43 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -74,7 +74,6 @@
 #	openprom	PROM settings
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -251,14 +250,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 121 $(($U*16)) 640 operator
-	M nss$U c 121 $(($(($U*16))+1)) 640 operator
-	M enss$U c 121 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -524,11 +515,11 @@ all)
 	R sd1 sd2 sd3 sd4 cd0 cd1 rd0 xy0 xy1 xy2 xy3 tun0 tun1 tun2
 	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 ss0 ss1 ch0 bio
-	R cuaa cuab cuac cuad ttya ttyb ttyc ttyd 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
+	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
 	;;
 
 presto*|xd*|xy*|sd*|raid*|ccd*)
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index f294c566acf..7f892731668 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.58 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.59 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -88,7 +88,6 @@
 #	pci*	PCI bus devices
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -281,14 +280,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 59 $(($U*16)) 640 operator
-	M nss$U c 59 $(($(($U*16))+1)) 640 operator
-	M enss$U c 59 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -620,12 +611,12 @@ all)
 	R sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9 cd0 cd1 rd0 tun0 tun1 tun2
 	R tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9
 	R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C
-	R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ss0 ss1 ch0
-	R ccd0 ccd1 ccd2 ccd3 hotplug ptm local wscons pci0 pci1 pci2
-	R pci3 uall video0 audio0 audio1 audio2 uk0 random lpa0 lpa1
-	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyh0 ttyh1
-	R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3
-	R std st0 st1 fd
+	R fd0D fd0E fd0F fd0G fd0H diskmap vscsi0 nnpfs0 ch0 ccd0 ccd1
+	R ccd2 ccd3 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+	R video0 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0
+	R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyh0 ttyh1 crypto pf
+	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
+	R fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index eaa68521ff1..fc310f95cf9 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.vax/MAKEDEV.md,v 1.40 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.vax/MAKEDEV.md,v 1.41 2010/07/03 03:59:15 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -75,7 +75,6 @@
 #	lkm	Loadable kernel modules interface
 #	pf*	Packet Filter
 #	*random	In-kernel random data source
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
@@ -299,14 +298,6 @@ systrace)
 	M systrace c 49 0 644
 	;;
 
-ss*)
-	M ss$U c 64 $(($U*16)) 640 operator
-	M nss$U c 64 $(($(($U*16))+1)) 640 operator
-	M enss$U c 64 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 *random)
 	n=0
 	for pre in " " s u a
@@ -525,9 +516,9 @@ local)
 all)
 	R dl0 dz0 dhu0 ts0 ts1 mt0 mt1 hd0 hd1 hd2 ccd0 vnd0 sd0 sd1
 	R sd2 sd3 cd0 tun0 tun1 bio bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6
-	R bpf7 pty0 diskmap vscsi0 nnpfs0 ss0 ptm local wscons uk0
-	R random lkm pf systrace rx0 rx1 ra0 ra1 ra2 ra3 hp0 hp1 hp2
-	R hp3 raid0 raid1 raid2 raid3 std st0 st1 fd
+	R bpf7 pty0 diskmap vscsi0 nnpfs0 ptm local wscons uk0 random
+	R lkm pf systrace rx0 rx1 ra0 ra1 ra2 ra3 hp0 hp1 hp2 hp3
+	R raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 up*|sd*|rx*|rl*|rb*|raid*|ra*|hp*|hk*|hd*|ccd*)
diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV
index db6b1c0ea97..73e159e77e2 100644
--- a/etc/etc.zaurus/MAKEDEV
+++ b/etc/etc.zaurus/MAKEDEV
@@ -3,10 +3,10 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.25 2010/06/26 23:49:50 jsing Exp 
-#	OpenBSD: MAKEDEV.common,v 1.47 2010/06/09 16:10:24 todd Exp 
-#	OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp 
-#	OpenBSD: MAKEDEV.sub,v 1.13 2005/01/28 18:51:38 danh Exp 
+#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.26 2010/07/03 03:59:16 krw Exp 
+#	OpenBSD: MAKEDEV.common,v 1.48 2010/06/14 14:07:49 todd 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 
 #
 #
 # Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -78,7 +78,6 @@
 #	*random	In-kernel random data source
 #	tun*	Network tunnel driver
 #	uk*	Unknown SCSI devices
-#	ss*	SCSI scanners
 #	systrace*	System call tracing device
 #	tuner*	Tuner devices
 #	video*	Video V4L2 devices
@@ -259,14 +258,6 @@ systrace)
 	M systrace c 50 0 644
 	;;
 
-ss*)
-	M ss$U c 29 $(($U*16)) 640 operator
-	M nss$U c 29 $(($(($U*16))+1)) 640 operator
-	M enss$U c 29 $(($(($U*16))+3)) 640 operator
-	RMlist[${#RMlist[*]}]="scan$U"
-	MKlist[${#MKlist[*]}]=";umask 77;ln -s ss$U scan$U"
-	;;
-
 uk*)
 	M uk$U c 28 $U 640 operator
 	;;
@@ -497,12 +488,12 @@ all)
 	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 bio diskmap vscsi0 nnpfs0 ss0 ss1 ch0 hotplug
-	R ptm local wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
-	R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 video0 audio0
-	R audio1 audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm
-	R crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3
-	R std st0 st1 fd
+	R bpf8 bpf9 pty0 bio diskmap vscsi0 nnpfs0 ch0 hotplug ptm
+	R local wscons uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
+	R rmidi6 rmidi7 tuner0 radio0 music0 video0 audio0 audio1
+	R audio2 uk0 random lkm tty00 tty01 tty02 tty03 apm crypto pf
+	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
+	R fd
 	;;
 
 wd*|sd*|raid*|ccd*)