From: mglocker Date: Fri, 23 Jul 2010 14:36:49 +0000 (+0000) Subject: Sync. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e1cb6a3395db4915597b36dc3b23aed288e441c6;p=openbsd Sync. --- diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV index 98e292adb42..4cf35783121 100644 --- a/etc/etc.alpha/MAKEDEV +++ b/etc/etc.alpha/MAKEDEV @@ -548,11 +548,11 @@ all) 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 + R tuner0 radio0 music0 speaker video0 video1 audio0 audio1 + R audio2 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 + R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 + R ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4 ttyB5 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.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV index 222e3a5e00c..eef8a1aeabd 100644 --- a/etc/etc.amd64/MAKEDEV +++ b/etc/etc.amd64/MAKEDEV @@ -590,11 +590,11 @@ all) 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 + R radio0 music0 speaker video0 video1 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 40d4e144a5d..07ce2b19bfd 100644 --- a/etc/etc.armish/MAKEDEV +++ b/etc/etc.armish/MAKEDEV @@ -502,9 +502,9 @@ all) 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 + R radio0 music0 video0 video1 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 ;; wd*|sd*|raid*|ccd*) diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV index be31756d9dd..af1ececfe4b 100644 --- a/etc/etc.hppa/MAKEDEV +++ b/etc/etc.hppa/MAKEDEV @@ -505,9 +505,9 @@ all) R bpf8 bpf9 pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 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 + R video1 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 lpt0 + R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf systrace wd0 + R wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*|ccd*) diff --git a/etc/etc.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV index 4d14ad9a7a1..9762a295e19 100644 --- a/etc/etc.hppa64/MAKEDEV +++ b/etc/etc.hppa64/MAKEDEV @@ -445,9 +445,9 @@ all) 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 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 + R pci1 pci2 pci3 video0 video1 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 ;; wd*|sd*|ccd*) diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV index ed68b57c7af..f1d35c390a4 100644 --- a/etc/etc.i386/MAKEDEV +++ b/etc/etc.i386/MAKEDEV @@ -605,11 +605,11 @@ all) 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 - R ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 wd3 raid0 - R raid1 raid2 raid3 std st0 st1 fd mcd0 + R tuner0 radio0 music0 speaker video0 video1 audio0 audio1 + R audio2 uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 + R lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 + R ttyc5 ttyc6 ttyc7 apm crypto pf pctr systrace wd0 wd1 wd2 + R wd3 raid0 raid1 raid2 raid3 std st0 st1 fd mcd0 ;; wd*|sd*|raid*|ccd*) diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV index 25ab8634f4f..cd97095e62b 100644 --- a/etc/etc.landisk/MAKEDEV +++ b/etc/etc.landisk/MAKEDEV @@ -478,7 +478,7 @@ all) 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 video0 video1 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 e88d6f8b1bb..010631063af 100644 --- a/etc/etc.loongson/MAKEDEV +++ b/etc/etc.loongson/MAKEDEV @@ -456,9 +456,9 @@ all) 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 pty1 pty2 diskmap vscsi0 nnpfs0 hotplug - R ptm local wscons pci0 pci1 pci2 pci3 uall video0 audio0 - R audio1 audio2 uk0 random tty00 tty01 tty02 tty03 apm crypto - R pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd + R ptm local wscons pci0 pci1 pci2 pci3 uall video0 video1 + R audio0 audio1 audio2 uk0 random tty00 tty01 tty02 tty03 apm + R crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd ;; wd*|sd*|ccd*) diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV index 0492fa469a9..2f759e34df8 100644 --- a/etc/etc.macppc/MAKEDEV +++ b/etc/etc.macppc/MAKEDEV @@ -519,9 +519,10 @@ all) R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 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 + R iop0 iop1 uall tuner0 radio0 video0 video1 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*) diff --git a/etc/etc.palm/MAKEDEV b/etc/etc.palm/MAKEDEV index 24438d19532..bcf063b069d 100644 --- a/etc/etc.palm/MAKEDEV +++ b/etc/etc.palm/MAKEDEV @@ -490,9 +490,10 @@ all) R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 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 + R rmidi7 tuner0 radio0 music0 video0 video1 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*) diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV index 765bdc2a6d3..e6341ffb3ac 100644 --- a/etc/etc.sgi/MAKEDEV +++ b/etc/etc.sgi/MAKEDEV @@ -449,9 +449,9 @@ 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 pty1 pty2 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 + R pci2 pci3 uall video0 video1 audio0 audio1 audio2 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/etc/etc.socppc/MAKEDEV b/etc/etc.socppc/MAKEDEV index 9b7cbf734cc..4555900ab1b 100644 --- a/etc/etc.socppc/MAKEDEV +++ b/etc/etc.socppc/MAKEDEV @@ -485,9 +485,9 @@ all) R sd9 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 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 + R radio0 video0 video1 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.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV index 86db5187af9..d33140969ba 100644 --- a/etc/etc.sparc64/MAKEDEV +++ b/etc/etc.sparc64/MAKEDEV @@ -613,10 +613,10 @@ all) R pty0 fd1 fd1B fd1C fd1D fd1E fd1F fd1G fd1H fd0 fd0B fd0C 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 + R video0 video1 audio0 audio1 audio2 uk0 random lpa0 lpa1 lpa2 + R 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 ;; wd*|sd*|raid*|ccd*) diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV index c586966952f..0c35972edab 100644 --- a/etc/etc.zaurus/MAKEDEV +++ b/etc/etc.zaurus/MAKEDEV @@ -490,10 +490,10 @@ all) R tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 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 + R rmidi6 rmidi7 tuner0 radio0 music0 video0 video1 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*)