summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/etc.alpha/MAKEDEV23
-rw-r--r--etc/etc.amd64/MAKEDEV23
-rw-r--r--etc/etc.armish/MAKEDEV16
-rw-r--r--etc/etc.cats/MAKEDEV16
-rw-r--r--etc/etc.hp300/MAKEDEV2
-rw-r--r--etc/etc.hppa/MAKEDEV16
-rw-r--r--etc/etc.hppa64/MAKEDEV15
-rw-r--r--etc/etc.i386/MAKEDEV22
-rw-r--r--etc/etc.landisk/MAKEDEV15
-rw-r--r--etc/etc.luna88k/MAKEDEV2
-rw-r--r--etc/etc.mac68k/MAKEDEV2
-rw-r--r--etc/etc.macppc/MAKEDEV17
-rw-r--r--etc/etc.mvme68k/MAKEDEV2
-rw-r--r--etc/etc.mvme88k/MAKEDEV2
-rw-r--r--etc/etc.sgi/MAKEDEV14
-rw-r--r--etc/etc.sparc/MAKEDEV2
-rw-r--r--etc/etc.sparc64/MAKEDEV17
-rw-r--r--etc/etc.vax/MAKEDEV2
-rw-r--r--etc/etc.zaurus/MAKEDEV2
19 files changed, 113 insertions, 97 deletions
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 9a04cdc571a..9e2a84f16a5 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.alpha/MAKEDEV.md,v 1.30 2006/04/16 11:34:01 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -76,7 +76,7 @@
# iop* I2O controller devices
# lkm Loadable kernel modules interface
# music* MIDI devices
-# pci PCI bus device
+# pci* PCI bus devices
# pf* Packet Filter
# radio* FM tuner devices
# rmidi* Raw MIDI devices
@@ -298,8 +298,9 @@ pf*)
M pf c 35 0 600
;;
-pci)
- M pci c 52 0 600
+pci*)
+ M pci$U c 52 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
music*)
@@ -526,13 +527,13 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 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 hotplug ptm local wscons pci iop0 iop1 uall rmidi0
- R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
- R radio0 music0 speaker audio0 uk0 random lpa0 lpa1 lpa2 lpt0
- R lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0 ttyc1 ttyc2
- R ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2 ttyB3 ttyB4
- R ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
- R raid3 std st0 st1 fd
+ R ss1 ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 iop0
+ R iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6
+ R rmidi7 tuner0 radio0 music0 speaker audio0 uk0 random lpa0
+ R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0
+ R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 ttyB0 ttyB1 ttyB2
+ R ttyB3 ttyB4 ttyB5 crypto pf systrace wd0 wd1 wd2 wd3 raid0
+ R raid1 raid2 raid3 std st0 st1 fd
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.amd64/MAKEDEV b/etc/etc.amd64/MAKEDEV
index bae2a8539f5..45f712e5b94 100644
--- a/etc/etc.amd64/MAKEDEV
+++ b/etc/etc.amd64/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.amd64/MAKEDEV.md,v 1.16 2006/06/11 10:58:57 mk Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -83,7 +83,7 @@
# joy* Joystick driver
# lkm Loadable kernel modules interface
# music* MIDI devices
-# pci PCI bus device
+# pci* PCI bus devices
# pctr* PC Performance Tuning Register access device
# pf* Packet Filter
# radio* FM tuner devices
@@ -305,8 +305,9 @@ pctr)
M pctr c 46 0 644
;;
-pci)
- M pci c 72 0 600
+pci*)
+ M pci$U c 72 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
music*)
@@ -570,13 +571,13 @@ all)
R sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0 bpf1 bpf2 bpf3
R bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 bio pty0 fd1 fd1B fd1C fd1D
R fd1E fd1F fd1G fd1H fd0 fd0B fd0C fd0D fd0E fd0F fd0G fd0H
- R xfs0 ss0 ss1 ch0 hotplug ptm gpr0 local wscons pci iop0 iop1
- R uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
- R tuner0 radio0 music0 speaker audio0 wt0 uk0 random joy0 joy1
- R lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03
- R ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 acpi crypto
- R pf pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std
- R st0 st1 fd mcd0
+ R xfs0 ss0 ss1 ch0 hotplug ptm gpr0 local wscons pci0 pci1
+ R pci2 pci3 iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3 rmidi4
+ R rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker audio0 wt0
+ R uk0 random joy0 joy1 lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00
+ R tty01 tty02 tty03 ttyc0 ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6
+ R ttyc7 acpi 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/etc/etc.armish/MAKEDEV b/etc/etc.armish/MAKEDEV
index 128f358465f..d4999d13c5c 100644
--- a/etc/etc.armish/MAKEDEV
+++ b/etc/etc.armish/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.armish/MAKEDEV.md,v 1.2 2006/07/28 17:37:09 kettenis Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -71,7 +71,7 @@
# fd fd/* nodes
# iop* I2O controller devices
# lkm Loadable kernel modules interface
-# pci PCI bus device
+# pci* PCI bus devices
# pf* Packet Filter
# radio* FM tuner devices
# *random In-kernel random data source
@@ -272,8 +272,9 @@ pf*)
M pf c 46 0 600
;;
-pci)
- M pci c 88 0 600
+pci*)
+ M pci$U c 88 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
lkm)
@@ -469,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 xfs0 ss0 ss1 ch0 hotplug ptm
- R local wscons pci iop0 iop1 uall tuner0 radio0 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 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
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.cats/MAKEDEV b/etc/etc.cats/MAKEDEV
index 5349f234208..49b3e1d1a6a 100644
--- a/etc/etc.cats/MAKEDEV
+++ b/etc/etc.cats/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.cats/MAKEDEV.md,v 1.15 2006/07/28 17:37:10 kettenis Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -69,7 +69,7 @@
# fd fd/* nodes
# iop* I2O controller devices
# lkm Loadable kernel modules interface
-# pci PCI bus device
+# pci* PCI bus devices
# pf* Packet Filter
# radio* FM tuner devices
# *random In-kernel random data source
@@ -271,8 +271,9 @@ pf*)
M pf c 39 0 600
;;
-pci)
- M pci c 88 0 600
+pci*)
+ M pci$U c 88 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
lkm)
@@ -464,9 +465,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 xfs0 ss0 ss1 ch0 ptm local
- R wscons pci iop0 iop1 uall tuner0 radio0 speaker audio0 uk0
- R random lkm tty00 tty01 tty02 tty03 crypto pf systrace wd0
- R wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd
+ R wscons pci0 pci1 pci2 pci3 iop0 iop1 uall tuner0 radio0
+ R speaker audio0 uk0 random lkm tty00 tty01 tty02 tty03 crypto
+ R pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0
+ R st1 fd
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV
index 11f17a04c00..0c50599104b 100644
--- a/etc/etc.hp300/MAKEDEV
+++ b/etc/etc.hp300/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.hp300/MAKEDEV.md,v 1.27 2006/04/16 02:49:52 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV
index 477102055b3..d21ff7b52b2 100644
--- a/etc/etc.hppa/MAKEDEV
+++ b/etc/etc.hppa/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.hppa/MAKEDEV.md,v 1.27 2006/04/16 02:49:52 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -71,7 +71,7 @@
# fd fd/* nodes
# hotplug devices hot plugging
# lkm Loadable kernel modules interface
-# pci PCI bus device
+# pci* PCI bus devices
# pdc PDC device
# pf* Packet Filter
# *random In-kernel random data source
@@ -263,8 +263,9 @@ pf*)
M pf c 21 0 600
;;
-pci)
- M pci c 31 0 600
+pci*)
+ M pci$U c 31 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
lkm)
@@ -484,9 +485,10 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 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 hotplug ptm local wscons pci uall audio0 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 ss1 ch0 hotplug ptm local wscons pci0 pci1 pci2 pci3 uall
+ R audio0 uk0 random lpa0 lpa1 lpa2 lpt0 lpt1 lpt2 lkm 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.hppa64/MAKEDEV b/etc/etc.hppa64/MAKEDEV
index bd584caf8a1..ad732d38e06 100644
--- a/etc/etc.hppa64/MAKEDEV
+++ b/etc/etc.hppa64/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.hppa64/MAKEDEV.md,v 1.4 2006/04/16 02:49:52 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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,7 +61,7 @@
# crypto Hardware crypto access driver
# fd fd/* nodes
# lkm Loadable kernel modules interface
-# pci PCI bus device
+# pci* PCI bus devices
# pdc PDC device
# pf* Packet Filter
# *random In-kernel random data source
@@ -253,8 +253,9 @@ pf*)
M pf c 21 0 600
;;
-pci)
- M pci c 31 0 600
+pci*)
+ M pci$U c 31 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
lkm)
@@ -429,9 +430,9 @@ all)
R cd0 cd1 rd0 tun0 tun1 tun2 tun3 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 pci audio0 uk0 random lpa0 lpa1
- R lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 crypto pf
- R systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+ 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
;;
wd*|sd*|ccd*)
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index 798f9444b4f..e478c688c81 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.i386/MAKEDEV.md,v 1.36 2006/06/11 10:58:57 mk Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -86,7 +86,7 @@
# lkm Loadable kernel modules interface
# music* MIDI devices
# nvram NVRAM access
-# pci PCI bus device
+# pci* PCI bus devices
# pctr* PC Performance Tuning Register access device
# pf* Packet Filter
# radio* FM tuner devices
@@ -308,8 +308,9 @@ pctr)
M pctr c 46 0 644
;;
-pci)
- M pci c 72 0 600
+pci*)
+ M pci$U c 72 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
nvram)
@@ -587,12 +588,13 @@ all)
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 xfs0 ss0 ss1 ch0 hotplug ptm gpr0
- R local wscons pci iop0 iop1 uall rmidi0 rmidi1 rmidi2 rmidi3
- R rmidi4 rmidi5 rmidi6 rmidi7 tuner0 radio0 music0 speaker
- R audio0 wt0 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 acpi apm crypto pf pctr systrace wd0
- R wd1 wd2 wd3 raid0 raid1 raid2 raid3 std st0 st1 fd mcd0
+ R local wscons pci0 pci1 pci2 pci3 iop0 iop1 uall rmidi0
+ R rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7 tuner0
+ R radio0 music0 speaker audio0 wt0 uk0 random joy0 joy1 lpa0
+ R lpa1 lpa2 lpt0 lpt1 lpt2 lkm tty00 tty01 tty02 tty03 ttyc0
+ R ttyc1 ttyc2 ttyc3 ttyc4 ttyc5 ttyc6 ttyc7 acpi apm crypto pf
+ R pctr systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2 raid3 std
+ R st0 st1 fd mcd0
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.landisk/MAKEDEV b/etc/etc.landisk/MAKEDEV
index c668da95fbd..067586243cb 100644
--- a/etc/etc.landisk/MAKEDEV
+++ b/etc/etc.landisk/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.landisk/MAKEDEV.md,v 1.2 2006/12/15 18:59:50 miod Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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,7 +68,7 @@
# crypto Hardware crypto access driver
# fd fd/* nodes
# lkm Loadable kernel modules interface
-# pci PCI bus device
+# pci* PCI bus devices
# pf* Packet Filter
# radio* FM tuner devices
# *random In-kernel random data source
@@ -269,8 +269,9 @@ pf*)
M pf c 46 0 600
;;
-pci)
- M pci c 88 0 600
+pci*)
+ M pci$U c 88 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
lkm)
@@ -450,9 +451,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 xfs0 ss0 ss1 ch0 ttya hotplug
- R ptm local wscons pci uall tuner0 radio0 audio0 uk0 random
- R lkm crypto pf systrace wd0 wd1 wd2 wd3 raid0 raid1 raid2
- R raid3 std st0 st1 fd
+ R ptm local wscons pci0 pci1 pci2 pci3 uall tuner0 radio0
+ 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/etc/etc.luna88k/MAKEDEV b/etc/etc.luna88k/MAKEDEV
index a5b540fc0b7..86a5f4af14b 100644
--- a/etc/etc.luna88k/MAKEDEV
+++ b/etc/etc.luna88k/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.luna88k/MAKEDEV.md,v 1.3 2006/04/16 02:49:52 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV
index f377858a94b..8290787e69e 100644
--- a/etc/etc.mac68k/MAKEDEV
+++ b/etc/etc.mac68k/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.mac68k/MAKEDEV.md,v 1.22 2006/04/16 02:49:52 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
diff --git a/etc/etc.macppc/MAKEDEV b/etc/etc.macppc/MAKEDEV
index cf93463fdfd..078664169e4 100644
--- a/etc/etc.macppc/MAKEDEV
+++ b/etc/etc.macppc/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.macppc/MAKEDEV.md,v 1.28 2006/04/16 11:34:02 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -75,7 +75,7 @@
# gpio* General Purpose Input/Output
# iop* I2O controller devices
# lkm Loadable kernel modules interface
-# pci PCI bus device
+# pci* PCI bus devices
# pf* Packet Filter
# radio* FM tuner devices
# *random In-kernel random data source
@@ -273,8 +273,9 @@ pf*)
M pf c 39 0 600
;;
-pci)
- M pci c 71 0 600
+pci*)
+ M pci$U c 71 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
lkm)
@@ -499,10 +500,10 @@ all)
R gpio0 gpio1 gpio2 ccd0 ccd1 ccd2 ccd3 vnd0 vnd1 vnd2 vnd3
R sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 tun0 tun1 tun2 tun3 bpf0
R bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 bpf8 bpf9 pty0 xfs0 ss0
- R ss1 ch0 cuaa cuab ttya ttyb hotplug ptm local wscons pci
- R iop0 iop1 uall tuner0 radio0 audio0 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 ss1 ch0 cuaa cuab ttya ttyb hotplug ptm local wscons pci0
+ R pci1 pci2 pci3 iop0 iop1 uall tuner0 radio0 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/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV
index 514c253ecad..bbca52dca18 100644
--- a/etc/etc.mvme68k/MAKEDEV
+++ b/etc/etc.mvme68k/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.mvme68k/MAKEDEV.md,v 1.16 2006/04/16 02:49:52 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV
index d1810e2b1fe..aa2aa130ad3 100644
--- a/etc/etc.mvme88k/MAKEDEV
+++ b/etc/etc.mvme88k/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.mvme88k/MAKEDEV.md,v 1.16 2006/04/16 02:49:52 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
diff --git a/etc/etc.sgi/MAKEDEV b/etc/etc.sgi/MAKEDEV
index 78d9174191f..6dba7a65f22 100644
--- a/etc/etc.sgi/MAKEDEV
+++ b/etc/etc.sgi/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.sgi/MAKEDEV.md,v 1.12 2006/04/16 11:34:02 todd Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -57,7 +57,7 @@
# bpf* Berkeley Packet Filter
# crypto Hardware crypto access driver
# fd fd/* nodes
-# pci PCI bus device
+# pci* PCI bus devices
# pf* Packet Filter
# *random In-kernel random data source
# ss* SCSI scanners
@@ -242,8 +242,9 @@ pf*)
M pf c 31 0 600
;;
-pci)
- M pci c 29 0 600
+pci*)
+ M pci$U c 29 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
fd)
@@ -382,8 +383,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 pty1 pty2 xfs0 ss0 ss1 ch0 ptm
- R local wscons pci audio0 uk0 random tty00 tty01 tty02 tty03
- R crypto pf systrace wd0 wd1 wd2 wd3 std st0 st1 fd
+ 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
;;
wd*|sd*|ccd*)
diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV
index 051f6b899ea..929f0095b5f 100644
--- a/etc/etc.sparc/MAKEDEV
+++ b/etc/etc.sparc/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.sparc/MAKEDEV.md,v 1.31 2006/08/28 21:04:04 tsi Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
diff --git a/etc/etc.sparc64/MAKEDEV b/etc/etc.sparc64/MAKEDEV
index 89d32299d19..a6ac27e5cac 100644
--- a/etc/etc.sparc64/MAKEDEV
+++ b/etc/etc.sparc64/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.sparc64/MAKEDEV.md,v 1.41 2006/08/28 21:04:04 tsi Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
@@ -83,7 +83,7 @@
# lkm Loadable kernel modules interface
# openprom PROM settings
# magma* Magma multiport cards
-# pci PCI bus device
+# pci* PCI bus devices
# pf* Packet Filter
# *random In-kernel random data source
# ss* SCSI scanners
@@ -279,8 +279,9 @@ pf*)
M pf c 73 0 600
;;
-pci)
- M pci c 52 0 600
+pci*)
+ M pci$U c 52 $U 600
+ MKlist[${#MKlist[*]}]=";[ -e pci ] || ln -s pci0 pci"
;;
magma*)
@@ -584,10 +585,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 pci uall audio0 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
+ 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
;;
wd*|sd*|raid*|ccd*)
diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV
index f344ace5eb7..64cd660c031 100644
--- a/etc/etc.vax/MAKEDEV
+++ b/etc/etc.vax/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.vax/MAKEDEV.md,v 1.27 2006/08/27 17:34:29 miod Exp
-# OpenBSD: MAKEDEV.common,v 1.29 2006/08/28 21:04:04 tsi Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#
diff --git a/etc/etc.zaurus/MAKEDEV b/etc/etc.zaurus/MAKEDEV
index 08ab10ee4d9..1fb5c976528 100644
--- a/etc/etc.zaurus/MAKEDEV
+++ b/etc/etc.zaurus/MAKEDEV
@@ -4,7 +4,7 @@
# generated from:
#
# OpenBSD: etc.zaurus/MAKEDEV.md,v 1.9 2006/07/25 20:22:27 kettenis Exp
-# OpenBSD: MAKEDEV.common,v 1.30 2006/10/10 12:33:41 todd Exp
+# OpenBSD: MAKEDEV.common,v 1.31 2006/12/15 20:42:19 kettenis 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
#