sync

13 files changed, 48 insertions, 44 deletions

diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 97150a004d6..c07d32cac21 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -542,11 +542,12 @@ 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 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
+	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
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index e407ad376b4..a2ac534316b 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -584,11 +584,11 @@ all)
 	R fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H xfs0 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 uk0 random lpa0
-	R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0
-	R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr
-	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
-	R fd
+	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
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.armish/MAKEDEV b/etc/etc.armish/MAKEDEV
index 84691e7c1e5..2d7e7295bfe 100644
--- a/etc/etc.armish/MAKEDEV
+++ b/etc/etc.armish/MAKEDEV
@@ -482,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 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
+	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
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 5c0e42eb5a9..09597d2c866 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -499,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 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
+	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
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index 1793de93486..2dc0cbea9e4 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -445,9 +445,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 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
+	R audio1 audio2 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
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 73229540036..4453f8bcc13 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -605,10 +605,11 @@ all)
 	R fd0H xfs0 ss0 ss1 ch0 hotplug ptm gpr0 local wscons pci0
 	R pci1 pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3
 	R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker
-	R video0 audio0 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1
-	R lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3
-	R ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr systrace wd0 wd1
-	R wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd mcd0
+	R video0 audio0 audio1 audio2 uk0 random joy0 joy1 lpa0 lpa1
+	R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1
+	R ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 apm crypto pf pctr
+	R systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1
+	R fd mcd0
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index c8822316828..7f922d83cac 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -458,8 +458,8 @@ 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 ttya hotplug
 	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
+	R audio0 audio1 audio2 uk0 random lkm crypto pf systrace wd0
+	R wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index 9ff2a0c428e..f3d59e0c802 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -519,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 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
+	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
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index dc860e2eb62..ed0200065dc 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -439,9 +439,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 uall video0 audio0 uk0
-	R random tty00 tty01 tty02 tty03 crypto pf systrace wd0 wd1
-	R wd2 wd3 std st0 st1 fd
+	R local wscons pci0 pci1 pci2 pci3 uall video0 audio0 audio1
+	R audio2 uk0 random tty00 tty01 tty02 tty03 crypto pf systrace
+	R wd0 wd1 wd2 wd3 std st0 st1 fd
 	;;
 
 wd*|sd*|ccd*)
diff --git a/etc/etc.socppc/MAKEDEV b/etc/etc.socppc/MAKEDEV
index ca322c08580..e2312323a51 100644
--- a/etc/etc.socppc/MAKEDEV
+++ b/etc/etc.socppc/MAKEDEV
@@ -484,9 +484,10 @@ 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 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
+	R pci0 pci1 pci2 pci3 iop0 iop1 uall radio0 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
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index acca84a5992..eeff3c07f3e 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -516,9 +516,9 @@ all)
 	R tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0
 	R fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D
 	R fd0E fd0F fd0G fd0H xfs0 ss0 ss1 ch0 bio cuaa cuab cuac cuad
-	R ttya ttyb ttyc ttyd ptm local wscons audio0 uk0 random lkm
-	R tty00 tty01 tty02 tty03 apm pf systrace xd0 xd1 xd2 xd3
-	R raid0 raid1 raid2 raid3 std st0 st1 fd
+	R ttya ttyb ttyc ttyd ptm local wscons audio0 audio1 audio2
+	R uk0 random lkm tty00 tty01 tty02 tty03 apm pf systrace xd0
+	R xd1 xd2 xd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 presto*|xd*|xy*|sd*|raid*|ccd*)
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index f1a4607f2fb..4408d03621a 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -598,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 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
+	R ptm local wscons pci0 pci1 pci2 pci3 uall video0 audio0
+	R audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm
+	R tty00 tty01 tty02 tty03 ttyh0 ttyh1 crypto pf systrace wd0
+	R wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
 	;;
 
 wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV
index c873e67cb2c..4a5ec3d9946 100644
--- a/etc/etc.zaurus/MAKEDEV
+++ b/etc/etc.zaurus/MAKEDEV
@@ -470,9 +470,10 @@ 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 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
+	R ptm local wscons 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
 	;;
 
 wd*|sd*|raid*|ccd*)