summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1999-12-07 09:16:52 +0000
committerkato <kato@FreeBSD.org>1999-12-07 09:16:52 +0000
commit07c05f3a8f96e7b4214c4a96ebaeb40dff9a6364 (patch)
tree18d24346bdd66ecaeddfe6e59ae36a5745bb9d34 /sys/pc98
parent03f3b6304174aefc44a82f53d0d1d13f3f1d2c2a (diff)
downloadFreeBSD-src-07c05f3a8f96e7b4214c4a96ebaeb40dff9a6364.zip
FreeBSD-src-07c05f3a8f96e7b4214c4a96ebaeb40dff9a6364.tar.gz
Merge from sys/i386/i386/userconfig.c rev 1.162 & 1.163.
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/i386/userconfig.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c
index 34924fa..9d0370f7 100644
--- a/sys/pc98/i386/userconfig.c
+++ b/sys/pc98/i386/userconfig.c
@@ -127,7 +127,6 @@
#include <i386/isa/isa_device.h>
-#include "pnp.h"
#undef NPNP
#define NPNP 0
@@ -412,14 +411,10 @@ static DEV_INFO device_info[] = {
{"xe", "Xircom PC Card Ethernet adapter", 0, CLS_NETWORK},
{"ze", "IBM/National Semiconductor PCMCIA Ethernet adapter",0, CLS_NETWORK},
{"zp", "3COM PCMCIA Etherlink III Ethernet adapter", 0, CLS_NETWORK},
-{"al", "ADMtek AL981/AN985 ethernet adapter", FLG_FIXED, CLS_NETWORK},
-{"ax", "ASIX AX88140A ethernet adapter", FLG_FIXED, CLS_NETWORK},
+{"dc", "DEC/Intel 21143 or clone Ethernet adapter", FLG_FIXED, CLS_NETWORK},
{"de", "DEC DC21040 Ethernet adapter", FLG_FIXED, CLS_NETWORK},
-{"dm", "Davicom DM910x Ethernet adapter", FLG_FIXED, CLS_NETWORK},
{"fpa", "DEC DEFPA PCI FDDI adapter", FLG_FIXED, CLS_NETWORK},
{"rl", "RealTek 8129/8139 ethernet adapter", FLG_FIXED, CLS_NETWORK},
-{"mx", "Macronix PMAC ethernet adapter", FLG_FIXED, CLS_NETWORK},
-{"pn", "Lite-On 82c168/82c169 PNIC adapter", FLG_FIXED, CLS_NETWORK},
{"tl", "Texas Instruments ThunderLAN ethernet adapter", FLG_FIXED, CLS_NETWORK},
{"vr", "VIA Rhine/Rhine II ethernet adapter", FLG_FIXED, CLS_NETWORK},
{"wb", "Winbond W89C840F ethernet adapter", FLG_FIXED, CLS_NETWORK},
OpenPOWER on IntegriCloud