From 6a453e6415081eb6ea6a37f7b4a1dc6202925773 Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Tue, 20 Aug 2013 14:30:20 +0000
Subject: [PATCH] regen

---
 src/etc/etc.alpha/MAKEDEV    | 11 +++--------
 src/etc/etc.amd64/MAKEDEV    | 11 +++--------
 src/etc/etc.armish/MAKEDEV   | 11 +++--------
 src/etc/etc.beagle/MAKEDEV   | 11 +++--------
 src/etc/etc.hppa/MAKEDEV     | 11 +++--------
 src/etc/etc.hppa64/MAKEDEV   | 11 +++--------
 src/etc/etc.i386/MAKEDEV     | 11 +++--------
 src/etc/etc.landisk/MAKEDEV  | 11 +++--------
 src/etc/etc.loongson/MAKEDEV | 11 +++--------
 src/etc/etc.macppc/MAKEDEV   | 11 +++--------
 src/etc/etc.sgi/MAKEDEV      | 11 +++--------
 src/etc/etc.socppc/MAKEDEV   | 11 +++--------
 src/etc/etc.sparc64/MAKEDEV  | 11 +++--------
 src/etc/etc.zaurus/MAKEDEV   | 11 +++--------
 14 files changed, 42 insertions(+), 112 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index fdf6d4b2..f57322d8 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.alpha/MAKEDEV.md,v 1.57 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -65,7 +65,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -364,10 +364,6 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-uscanner*)
-	M uscanner$U c 66 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 45 $U 660
@@ -395,8 +391,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index ffada1a7..2f123785 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.amd64/MAKEDEV.md,v 1.51 2013/08/08 10:39:28 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.68 2013/07/06 17:33:44 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -64,7 +64,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	agp*	AGP bridge
 #	apm	Power Management Interface
@@ -395,10 +395,6 @@ agp*)
 	MKlist[${#MKlist[*]}]=";[ -e agpgart ] || ln -s agp$U agpgart"
 	;;
 
-uscanner*)
-	M uscanner$U c 77 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 61 $U 660
@@ -426,8 +422,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV
index b79b6eda..e3650814 100644
--- a/src/etc/etc.armish/MAKEDEV
+++ b/src/etc/etc.armish/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.armish/MAKEDEV.md,v 1.27 2013/06/03 17:34:15 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -58,7 +58,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -347,10 +347,6 @@ apm*)
 	M apmctl	c 34 8 644
 	;;
 
-uscanner*)
-	M uscanner$U c 69 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 64 $U 660
@@ -378,8 +374,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.beagle/MAKEDEV b/src/etc/etc.beagle/MAKEDEV
index 46f86e95..492ea14c 100644
--- a/src/etc/etc.beagle/MAKEDEV
+++ b/src/etc/etc.beagle/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.beagle/MAKEDEV.md,v 1.5 2013/06/03 17:34:15 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -58,7 +58,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -347,10 +347,6 @@ apm*)
 	M apmctl	c 34 8 644
 	;;
 
-uscanner*)
-	M uscanner$U c 69 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 64 $U 660
@@ -378,8 +374,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index ed8eb868..43d7ddba 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.hppa/MAKEDEV.md,v 1.49 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -62,7 +62,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	ttyU*	USB serial ports
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -321,10 +321,6 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-uscanner*)
-	M uscanner$U c 46 $U 660
-	;;
-
 ttyU[0-9a-zA-Z])
 	U=${i#ttyU*}
 	o=$(alph2d $U)
@@ -359,8 +355,7 @@ usb*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 lpt*|lpa*)
diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
index 25640e52..a9d8b732 100644
--- a/src/etc/etc.hppa64/MAKEDEV
+++ b/src/etc/etc.hppa64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.26 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -62,7 +62,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	ttyU*	USB serial ports
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -311,10 +311,6 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-uscanner*)
-	M uscanner$U c 46 $U 660
-	;;
-
 ttyU[0-9a-zA-Z])
 	U=${i#ttyU*}
 	o=$(alph2d $U)
@@ -349,8 +345,7 @@ usb*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 lpt*|lpa*)
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 71579edb..3cbf7228 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.i386/MAKEDEV.md,v 1.66 2013/08/08 10:39:29 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.68 2013/07/06 17:33:44 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -64,7 +64,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	agp*	AGP bridge
 #	amdmsr	AMD MSR access device
@@ -405,10 +405,6 @@ agp*)
 	MKlist[${#MKlist[*]}]=";[ -e agpgart ] || ln -s agp$U agpgart"
 	;;
 
-uscanner*)
-	M uscanner$U c 77 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 61 $U 660
@@ -436,8 +432,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index 5c51df31..ee7fd5d8 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.landisk/MAKEDEV.md,v 1.29 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.66 2013/06/21 21:30:38 syl Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -58,7 +58,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -326,10 +326,6 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-uscanner*)
-	M uscanner$U c 69 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 64 $U 660
@@ -357,8 +353,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.loongson/MAKEDEV b/src/etc/etc.loongson/MAKEDEV
index 6329b06e..cc899420 100644
--- a/src/etc/etc.loongson/MAKEDEV
+++ b/src/etc/etc.loongson/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.loongson/MAKEDEV.md,v 1.14 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -59,7 +59,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -312,10 +312,6 @@ apm*)
 	M apmctl	c 14 8 644
 	;;
 
-uscanner*)
-	M uscanner$U c 72 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 61 $U 660
@@ -343,8 +339,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 1f29e924..725d19b7 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.macppc/MAKEDEV.md,v 1.55 2013/08/08 10:39:29 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.68 2013/07/06 17:33:44 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -61,7 +61,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -364,10 +364,6 @@ apm*)
 	M apmctl	c 25 8 644
 	;;
 
-uscanner*)
-	M uscanner$U c 74 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 61 $U 660
@@ -402,8 +398,7 @@ ttyU[0-9a-zA-Z])
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 wsmouse[0-9]*)
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 8266f4f8..0883dd2c 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sgi/MAKEDEV.md,v 1.38 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -60,7 +60,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -302,10 +302,6 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-uscanner*)
-	M uscanner$U c 72 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 61 $U 660
@@ -333,8 +329,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV
index 4d7a1fdf..d328d433 100644
--- a/src/etc/etc.socppc/MAKEDEV
+++ b/src/etc/etc.socppc/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.socppc/MAKEDEV.md,v 1.19 2013/06/03 16:06:42 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -59,7 +59,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	bpf*	Berkeley Packet Filter
 #	bthub*	Bluetooth Hubs
@@ -285,10 +285,6 @@ bpf*)
 	M bpf$U c 22 $U 600
 	;;
 
-uscanner*)
-	M uscanner$U c 74 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 61 $U 660
@@ -323,8 +319,7 @@ ttyU[0-9a-zA-Z])
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 wsmouse[0-9]*)
diff --git a/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index d4abcc3f..77e86191 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.74 2013/08/08 10:39:29 jsg Exp 
-#	OpenBSD: MAKEDEV.common,v 1.68 2013/07/06 17:33:44 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -73,7 +73,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -372,10 +372,6 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
-uscanner*)
-	M uscanner$U c 96 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 90 $U 660
@@ -403,8 +399,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])
diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV
index 2c0320fb..28b3f6b7 100644
--- a/src/etc/etc.zaurus/MAKEDEV
+++ b/src/etc/etc.zaurus/MAKEDEV
@@ -4,7 +4,7 @@
 # generated from:
 #
 #	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.33 2013/06/03 17:34:15 tedu Exp 
-#	OpenBSD: MAKEDEV.common,v 1.67 2013/07/06 16:14:38 naddy Exp 
+#	OpenBSD: MAKEDEV.common,v 1.69 2013/08/20 14:27:24 ajacoutot Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.81 2012/11/05 08:07:09 jasper Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -58,7 +58,7 @@
 #	ulpt*	Printer devices
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
-#	uscanner*	Scanners
+uscan_dev
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -336,10 +336,6 @@ apm*)
 	M apmctl	c 34 8 644
 	;;
 
-uscanner*)
-	M uscanner$U c 69 $U 660
-	;;
-
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 64 $U 660
@@ -367,8 +363,7 @@ ugen*)
 
 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
+	R uhid2 uhid3 urio0 usb0 usb1 usb2 usb3 usb4 usb5 usb6 usb7
 	;;
 
 ttyU[0-9a-zA-Z])