From 8969a9cf8b9d553ec3caea9966f295d4c6d57168 Mon Sep 17 00:00:00 2001 From: kato Date: Wed, 13 Sep 2000 10:10:34 +0000 Subject: Merged from sys/i386/conf/GENERIC revision 1.274. --- sys/pc98/conf/GENERIC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/pc98/conf') diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index f0399c8..07881e9 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -157,7 +157,6 @@ device olpt 1 # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device tx # SMC 9432TX (83c170 ``EPIC'') device vx # 3Com 3c590, 3c595 (``Vortex'') device wx # Intel Gigabit Ethernet Card (``Wiseman'') @@ -169,6 +168,7 @@ device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 device ste # Sundance ST201 (D-Link DFE-550TX) device tl # Texas Instruments ThunderLAN +device tx # SMC 9432TX (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -- cgit v1.1