Merge from sys/i386/i386/userconfig.c rev 1.162 & 1.163.
This commit is contained in:
parent
7775a61eb2
commit
c5b32fb8d2
@ -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},
|
||||
|
Loading…
Reference in New Issue
Block a user