From 29c6a10b5853e3af7847b95747dbc425c14b918b Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Thu, 18 Feb 1999 01:13:40 +0000
Subject: [PATCH] Add a little bit more identifying information to the myriad
 PCI network drivers.

---
 sys/amd64/conf/GENERIC | 31 +++++++++++++++++--------------
 sys/i386/conf/GENERIC  | 31 +++++++++++++++++--------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index a39caaaa899..c53d69c54ab 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.149 1999/02/14 12:00:00 nsouch Exp $
+#	$Id: GENERIC,v 1.150 1999/02/14 20:28:38 jkh Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -153,23 +153,26 @@ device		plip0	at ppbus?
 device		ppi0	at ppbus?
 #controller	vpo0	at ppbus?
 
+#
+# The following Ethernet NICs are all PCI devices.
+#
+device ax0		# ASIX AX88140A
+device de0		# DEC/Intel DC21x4x (``Tulip'')
+device fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
+device mx0		# Macronix 98713/98715/98725 (``PMAC'')
+device pn0		# Lite-On 82c168/82c169 (``PNIC'')
+device rl0		# RealTek 8129/8139
+device tl0		# Texas Instruments ThunderLAN
+device tx0		# SMC 9432TX (83c170 ``EPIC'')
+device vr0		# VIA Rhine, Rhine II
+device vx0		# 3Com 3c590, 3c595 (``Vortex'')
+device wb0		# Winbond W89C840F
+device xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
-device ax0
-device de0
-device fxp0
-device mx0
-device pn0
-device rl0
-device tl0
-device tx0
-device vr0
-device vx0
-device wb0
-device xl0
-
 device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000
 device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000
 device ep0 at isa? port 0x300 net irq 10
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index a39caaaa899..c53d69c54ab 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.149 1999/02/14 12:00:00 nsouch Exp $
+#	$Id: GENERIC,v 1.150 1999/02/14 20:28:38 jkh Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -153,23 +153,26 @@ device		plip0	at ppbus?
 device		ppi0	at ppbus?
 #controller	vpo0	at ppbus?
 
+#
+# The following Ethernet NICs are all PCI devices.
+#
+device ax0		# ASIX AX88140A
+device de0		# DEC/Intel DC21x4x (``Tulip'')
+device fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
+device mx0		# Macronix 98713/98715/98725 (``PMAC'')
+device pn0		# Lite-On 82c168/82c169 (``PNIC'')
+device rl0		# RealTek 8129/8139
+device tl0		# Texas Instruments ThunderLAN
+device tx0		# SMC 9432TX (83c170 ``EPIC'')
+device vr0		# VIA Rhine, Rhine II
+device vx0		# 3Com 3c590, 3c595 (``Vortex'')
+device wb0		# Winbond W89C840F
+device xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
-device ax0
-device de0
-device fxp0
-device mx0
-device pn0
-device rl0
-device tl0
-device tx0
-device vr0
-device vx0
-device wb0
-device xl0
-
 device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000
 device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000
 device ep0 at isa? port 0x300 net irq 10