From 51b8635995770cf3473eb3c318bfeb894cd294bd Mon Sep 17 00:00:00 2001
From: todd <>
Date: Thu, 12 Jun 2008 20:42:00 +0000
Subject: [PATCH] sync

---
 src/etc/etc.alpha/MAKEDEV   | 18 ++++++++++++------
 src/etc/etc.amd64/MAKEDEV   | 14 +++++++-------
 src/etc/etc.armish/MAKEDEV  | 14 ++++++++++----
 src/etc/etc.hppa/MAKEDEV    | 14 ++++++++++----
 src/etc/etc.hppa64/MAKEDEV  | 16 ++++++++++++----
 src/etc/etc.i386/MAKEDEV    | 18 ++++++++++++------
 src/etc/etc.landisk/MAKEDEV | 14 ++++++++++----
 src/etc/etc.macppc/MAKEDEV  | 16 +++++++++++-----
 src/etc/etc.sgi/MAKEDEV     | 17 ++++++++++++-----
 src/etc/etc.socppc/MAKEDEV  | 16 +++++++++++-----
 src/etc/etc.sparc64/MAKEDEV | 16 +++++++++++-----
 src/etc/etc.zaurus/MAKEDEV  | 14 ++++++++++----
 12 files changed, 128 insertions(+), 59 deletions(-)

diff --git a/src/etc/etc.alpha/MAKEDEV b/src/etc/etc.alpha/MAKEDEV
index c09a77bf..087cf910 100644
--- a/src/etc/etc.alpha/MAKEDEV
+++ b/src/etc/etc.alpha/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.35 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.alpha/MAKEDEV.md,v 1.36 2008/06/12 20:39:28 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -66,6 +66,7 @@
 #	uhid*	Generic HID devices
 #	ulpt*	Printer devices
 #	usb*	Bus control devices used by usbd for attach/detach
+#	video*	Video V4L devices
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -356,6 +357,11 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+video*)
+	M video$U  c 44 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 usb*)
 	[ "$i" = "usb" ] && u= || u=$U
 	M usb$u c 45 $U 660
@@ -536,11 +542,11 @@ all)
 	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 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 audio0 uk0 random
-	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
-	R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1
-	R ttyB2 ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3
-	R raid0 raid1 raid2 raid3 std st0 st1 fd
+	R rmidi6 rmidi7 tuner0 radio0 music0 speaker video0 audio0 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/src/etc/etc.amd64/MAKEDEV b/src/etc/etc.amd64/MAKEDEV
index e80a0dcf..04ff17d8 100644
--- a/src/etc/etc.amd64/MAKEDEV
+++ b/src/etc/etc.amd64/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.25 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.amd64/MAKEDEV.md,v 1.26 2008/06/12 20:39:28 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -68,6 +68,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	agp*	AGP bridge
 #	apm	Power Management Interface
@@ -97,7 +98,6 @@
 #	tun*	Network tunnel driver
 #	tuner*	Tuner devices
 #	uk*	Unknown SCSI devices
-#	video*	Video V4L devices
 #	xfs*	XFS filesystem node
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 T=$0
@@ -254,11 +254,6 @@ xfs*)
 	M xfs$U c 51 $U 600
 	;;
 
-video*)
-	M video$U  c 44 $U
-	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
-	;;
-
 uk*)
 	M uk$U c 20 $U 640 operator
 	;;
@@ -396,6 +391,11 @@ agp*)
 	MKlist[${#MKlist[*]}]=";[ -e agpgart ] || ln -s agp$U agpgart"
 	;;
 
+video*)
+	M video$U  c 44 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 77 $U 660
 	;;
diff --git a/src/etc/etc.armish/MAKEDEV b/src/etc/etc.armish/MAKEDEV
index 6641441a..f4477fb6 100644
--- a/src/etc/etc.armish/MAKEDEV
+++ b/src/etc/etc.armish/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.armish/MAKEDEV.md,v 1.6 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.armish/MAKEDEV.md,v 1.7 2008/06/12 20:39:28 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -61,6 +61,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -328,6 +329,11 @@ apm*)
 	M apmctl	c 34 8 644
 	;;
 
+video*)
+	M video$U  c 38 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 69 $U 660
 	;;
@@ -476,9 +482,9 @@ all)
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 hotplug ptm
 	R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall tuner0
-	R radio0 audio0 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 radio0 video0 audio0 uk0 random lkm tty00 tty01 tty02 tty03
+	R apm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
+	R raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/src/etc/etc.hppa/MAKEDEV b/src/etc/etc.hppa/MAKEDEV
index 45b7f9b0..18113e54 100644
--- a/src/etc/etc.hppa/MAKEDEV
+++ b/src/etc/etc.hppa/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.31 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.hppa/MAKEDEV.md,v 1.32 2008/06/12 20:39:28 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -64,6 +64,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	ttyU*	USB serial ports
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	bio	ioctl tunnel pseudo-device
 #	audio*	Audio devices
@@ -306,6 +307,11 @@ bio)
 	M bio c 37 0 600
 	;;
 
+video*)
+	M video$U  c 33 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 46 $U 660
 	;;
@@ -493,9 +499,9 @@ all)
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
 	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0
 	R ss1 bio ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3
-	R uall audio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm
-	R tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3
-	R std st0 st1 fd
+	R uall video0 audio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2
+	R lkm tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2
+	R wd3 std st0 st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/src/etc/etc.hppa64/MAKEDEV b/src/etc/etc.hppa64/MAKEDEV
index 48a30411..84d3210d 100644
--- a/src/etc/etc.hppa64/MAKEDEV
+++ b/src/etc/etc.hppa64/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.8 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.hppa64/MAKEDEV.md,v 1.9 2008/06/12 20:39:29 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -55,6 +55,8 @@
 #	wsmouse*	wscons mice
 # Printers:
 #	lpt*	IEEE 1284 centronics printer
+# USB devices:
+#	video*	Video V4L devices
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -292,6 +294,11 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+video*)
+	M video$U  c 33 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 lpt*|lpa*)
 	case $i in
 	lpt*) n=lpt f=0;;
@@ -437,9 +444,10 @@ all)
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F
 	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0
-	R ss1 ch0 ptm local wscons pci0 pci1 pci2 pci3 audio0 uk0
-	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
-	R tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+	R ss1 ch0 ptm local wscons pci0 pci1 pci2 pci3 video0 audio0
+	R uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01
+	R tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1
+	R fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 77eea706..cbd28975 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.i386/MAKEDEV.md,v 1.41 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.i386/MAKEDEV.md,v 1.42 2008/06/12 20:39:29 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -68,6 +68,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	agp*	AGP bridge
 #	apm	Power management device
@@ -395,6 +396,11 @@ agp*)
 	MKlist[${#MKlist[*]}]=";[ -e agpgart ] || ln -s agp$U agpgart"
 	;;
 
+video*)
+	M video$U  c 44 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 77 $U 660
 	;;
@@ -588,11 +594,11 @@ all)
 	R fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 ss0
 	R ss1 ch0 hotplug ptm gpr0 local wscons pci0 pci1 pci2 pci3
 	R iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5
-	R rmidi6 rmidi7 tuner0 radio0 music0 speaker audio0 uk0 random
-	R joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01
-	R tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7
-	R apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1
-	R raid2 raid3 std st0 st1 fd mcd0
+	R rmidi6 rmidi7 tuner0 radio0 music0 speaker video0 audio0 uk0
+	R random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
+	R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+	R ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0
+	R raid1 raid2 raid3 std st0 st1 fd mcd0
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/src/etc/etc.landisk/MAKEDEV b/src/etc/etc.landisk/MAKEDEV
index 92181809..7d13438f 100644
--- a/src/etc/etc.landisk/MAKEDEV
+++ b/src/etc/etc.landisk/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.8 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.landisk/MAKEDEV.md,v 1.9 2008/06/12 20:39:29 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -61,6 +61,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -307,6 +308,11 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+video*)
+	M video$U  c 77 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 69 $U 660
 	;;
@@ -451,9 +457,9 @@ all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 ttya hotplug
-	R ptm local wscons pci0 pci1 pci2 pci3 uall radio0 audio0 uk0
-	R random lkm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1
-	R raid2 raid3 std st0 st1 fd
+	R ptm local wscons pci0 pci1 pci2 pci3 uall radio0 video0
+	R audio0 uk0 random lkm crypto pf systrace wd0 wd1 wd2 wd3
+	R raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/src/etc/etc.macppc/MAKEDEV b/src/etc/etc.macppc/MAKEDEV
index 1e8d81f0..c0706833 100644
--- a/src/etc/etc.macppc/MAKEDEV
+++ b/src/etc/etc.macppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.32 2007/11/12 19:24:43 kettenis Exp 
-#	OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp 
+#	OpenBSD: etc.macppc/MAKEDEV.md,v 1.33 2008/06/12 20:39:29 todd Exp 
+#	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -64,6 +64,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -339,6 +340,11 @@ apm*)
 	M apmctl	c 25 8 644
 	;;
 
+video*)
+	M video$U  c 45 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 74 $U 660
 	;;
@@ -513,9 +519,9 @@ all)
 	R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
 	R bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 cuaa cuab ttya ttyb hotplug
 	R ptm local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall tuner0
-	R radio0 audio0 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 radio0 video0 audio0 uk0 random lkm tty00 tty01 tty02 tty03
+	R apm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
+	R raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/src/etc/etc.sgi/MAKEDEV b/src/etc/etc.sgi/MAKEDEV
index 0bf9aa25..efa82972 100644
--- a/src/etc/etc.sgi/MAKEDEV
+++ b/src/etc/etc.sgi/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.15 2007/05/28 22:26:02 todd Exp 
-#	OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp 
+#	OpenBSD: etc.sgi/MAKEDEV.md,v 1.16 2008/06/12 20:39:29 todd Exp 
+#	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -52,6 +52,8 @@
 #	wsmux	wscons keyboard/mouse mux devices
 # Pointing devices:
 #	wsmouse*	wscons mice
+# USB devices:
+#	video*	Video V4L devices
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -277,6 +279,11 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+video*)
+	M video$U  c 45 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 wsmouse*)
 	M wsmouse$U c 27 $U 600
 	;;
@@ -388,9 +395,9 @@ all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bio bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 pty1 pty2 xfs0 ss0 ss1 ch0 ptm
-	R local wscons pci0 pci1 pci2 pci3 audio0 uk0 random tty00
-	R tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3 std st0
-	R st1 fd
+	R local wscons pci0 pci1 pci2 pci3 video0 audio0 uk0 random
+	R tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1 wd2 wd3
+	R std st0 st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/src/etc/etc.socppc/MAKEDEV b/src/etc/etc.socppc/MAKEDEV
index f260cb6c..e78d9ffe 100644
--- a/src/etc/etc.socppc/MAKEDEV
+++ b/src/etc/etc.socppc/MAKEDEV
@@ -3,8 +3,8 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.1 2008/05/13 19:39:58 kettenis Exp 
-#	OpenBSD: MAKEDEV.common,v 1.36 2007/07/23 23:21:25 todd Exp 
+#	OpenBSD: etc.socppc/MAKEDEV.md,v 1.2 2008/06/12 20:39:29 todd Exp 
+#	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
 #
@@ -62,6 +62,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -325,6 +326,11 @@ apm*)
 	M apmctl	c 25 8 644
 	;;
 
+video*)
+	M video$U  c 44 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 74 $U 660
 	;;
@@ -478,9 +484,9 @@ all)
 	R ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0
 	R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7
 	R bpf8 bpf9 pty0 xfs0 ss0 ss1 ch0 hotplug ptm local wscons
-	R pci0 pci1 pci2 pci3 iop0 iop1 uall radio0 audio0 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 pci0 pci1 pci2 pci3 iop0 iop1 uall radio0 video0 audio0 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/src/etc/etc.sparc64/MAKEDEV b/src/etc/etc.sparc64/MAKEDEV
index 009a81ca..f9307ac8 100644
--- a/src/etc/etc.sparc64/MAKEDEV
+++ b/src/etc/etc.sparc64/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.45 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.sparc64/MAKEDEV.md,v 1.46 2008/06/12 20:39:29 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -74,6 +74,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	audio*	Audio devices
 #	bio	ioctl tunnel pseudo-device
@@ -345,6 +346,11 @@ audio*)
 	MKlist[${#MKlist[*]}]=";[ -e audioctl ] || ln -s audioctl$U audioctl"
 	;;
 
+video*)
+	M video$U  c 44 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 96 $U 660
 	;;
@@ -592,10 +598,10 @@ all)
 	R bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 fd1
 	R fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E
 	R fd0F fd0G fd0H xfs0 ss0 ss1 ch0 ccd0 ccd1 ccd2 ccd3 hotplug
-	R ptm local wscons pci0 pci1 pci2 pci3 uall audio0 uk0 random
-	R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
-	R ttyh0 ttyh1 crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1
-	R raid2 raid3 std st0 st1 fd
+	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 audio0 uk0
+	R random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02
+	R tty03 ttyh0 ttyh1 crypto pf systrace wd0 wd1 wd2 wd3 raid0
+	R raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/src/etc/etc.zaurus/MAKEDEV b/src/etc/etc.zaurus/MAKEDEV
index f3095cfe..d7010520 100644
--- a/src/etc/etc.zaurus/MAKEDEV
+++ b/src/etc/etc.zaurus/MAKEDEV
@@ -3,7 +3,7 @@
 # THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
 # generated from:
 #
-#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.13 2008/06/12 18:52:46 todd Exp 
+#	OpenBSD: etc.zaurus/MAKEDEV.md,v 1.14 2008/06/12 20:39:29 todd Exp 
 #	OpenBSD: MAKEDEV.common,v 1.37 2008/06/10 07:12:24 mglocker Exp 
 #	OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp 
 #	OpenBSD: MAKEDEV.sub,v 1.14 2005/02/07 06:14:18 david Exp 
@@ -61,6 +61,7 @@
 #	urio*	Diamond Multimedia Rio 500
 #	usb*	Bus control devices used by usbd for attach/detach
 #	uscanner*	Scanners
+#	video*	Video V4L devices
 # Special purpose devices:
 #	apm	Power management device
 #	audio*	Audio devices
@@ -317,6 +318,11 @@ apm*)
 	M apmctl	c 34 8 644
 	;;
 
+video*)
+	M video$U  c 38 $U
+	MKlist[${#MKlist[*]}]=";[ -e video ] || ln -s video$U video"
+	;;
+
 uscanner*)
 	M uscanner$U c 69 $U 660
 	;;
@@ -464,9 +470,9 @@ all)
 	R ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3 sd0 sd1 sd2 sd3 sd4
 	R cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4
 	R bpf5 bpf6 bpf7 bpf8 bpf9 pty0 bio xfs0 ss0 ss1 ch0 hotplug
-	R ptm local wscons uall tuner0 radio0 audio0 uk0 random lkm
-	R tty00 tty01 tty02 tty03 apm crypto pf systrace wd0 wd1 wd2
-	R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+	R ptm local wscons uall tuner0 radio0 video0 audio0 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
 	;;
 
 wd*|sd*|raid*|ccd*)