diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2006-05-16 12:15:39 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2006-05-16 12:15:39 +0000 |
| commit | 155d9f6a98ff8f6d7416951bf4ee9c089a461f53 (patch) | |
| tree | b86a7382e9b60682337f0a24d4e3482744402eaa | |
| parent | 441bc021a22e77b2afe41ce8235d07cf16b7f88f (diff) | |
Notes
| -rw-r--r-- | sys/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/dev/le/if_le_pci.c | 3 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/pc98/conf/GENERIC | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index a1dc9dd77ab1..0367ac253df5 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -202,7 +202,7 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking -device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc') +device pcn # AMD Am79C97x PCI 10/100 device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') @@ -224,8 +224,6 @@ device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards -# XXX kvtop brokenness, pointer/int warnings -#device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of Ethernet chips device xe # Xircom pccard Ethernet diff --git a/sys/dev/le/if_le_pci.c b/sys/dev/le/if_le_pci.c index aa1f96028a42..2c6da163f2cd 100644 --- a/sys/dev/le/if_le_pci.c +++ b/sys/dev/le/if_le_pci.c @@ -289,8 +289,7 @@ le_pci_probe(device_t dev) case AMD_PCNET_PCI: case AMD_PCNET_HOME: device_set_desc(dev, "AMD PCnet Ethernet"); - /* Let lnc(4) win for now. */ - return (BUS_PROBE_LOW_PRIORITY); + return (BUS_PROBE_DEFAULT); default: return (ENXIO); } diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 298d3ca38b59..92898d045eee 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -213,7 +213,7 @@ device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking -device pcn # AMD Am79C97x PCI 10/100(precedence over 'lnc') +device pcn # AMD Am79C97x PCI 10/100 device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index dcdd4241cdf3..9f4608a72970 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -178,7 +178,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') +device pcn # AMD Am79C97x PCI 10/100 device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') |