diff options
| -rwxr-xr-x | release/amd64/dokern.sh | 1 | ||||
| -rwxr-xr-x | release/i386/dokern.sh | 1 | ||||
| -rw-r--r-- | release/i386/drivers.conf | 1 | ||||
| -rwxr-xr-x | release/pc98/dokern.sh | 1 | ||||
| -rw-r--r-- | sys/amd64/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 2 |
6 files changed, 2 insertions, 6 deletions
diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh index f5b7b5e..d4754fc 100755 --- a/release/amd64/dokern.sh +++ b/release/amd64/dokern.sh @@ -55,7 +55,6 @@ sed -e '/ pty /d' \ -e '/ vx /d' \ -e '/ dc /d' \ -e '/ fxp /d' \ - -e '/ pcn /d' \ -e '/ rl /d' \ -e '/ sf /d' \ -e '/ sis /d' \ diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh index f5b7b5e..d4754fc 100755 --- a/release/i386/dokern.sh +++ b/release/i386/dokern.sh @@ -55,7 +55,6 @@ sed -e '/ pty /d' \ -e '/ vx /d' \ -e '/ dc /d' \ -e '/ fxp /d' \ - -e '/ pcn /d' \ -e '/ rl /d' \ -e '/ sf /d' \ -e '/ sis /d' \ diff --git a/release/i386/drivers.conf b/release/i386/drivers.conf index 74c129f..d605b19 100644 --- a/release/i386/drivers.conf +++ b/release/i386/drivers.conf @@ -47,7 +47,6 @@ fxp if_fxp 2 network "Intel EtherExpress Pro/100B PCI Fast Ethernet card" kue if_kue 2 network "Kawasaki LSI USB ethernet adapter" lnc if_lnc 2 network "NE2100, NE32-VL Lance Ethernet cards" miibus miibus 2 network "MII bus support" -pcn if_pcn 2 network "AMD Am79c79x PCI ethernet card" rl if_rl 2 network "RealTek 8129/8139 PCI ethernet card" sf if_sf 2 network "Adaptec AIC-6915 PCI ethernet card" sis if_sis 2 network "SiS 900/SiS 7016 PCI ethernet card" diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh index f5b7b5e..d4754fc 100755 --- a/release/pc98/dokern.sh +++ b/release/pc98/dokern.sh @@ -55,7 +55,6 @@ sed -e '/ pty /d' \ -e '/ vx /d' \ -e '/ dc /d' \ -e '/ fxp /d' \ - -e '/ pcn /d' \ -e '/ rl /d' \ -e '/ sf /d' \ -e '/ sis /d' \ diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index efb89ef..c65fd65 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -185,7 +185,7 @@ device vx # 3Com 3c590, 3c595 (``Vortex'') device miibus # MII bus support device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device pcn # AMD Am79C97x PCI 10/100 NICs +device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index efb89ef..c65fd65 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -185,7 +185,7 @@ device vx # 3Com 3c590, 3c595 (``Vortex'') device miibus # MII bus support device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device pcn # AMD Am79C97x PCI 10/100 NICs +device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 |
