diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-01-03 01:22:54 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-01-03 01:22:54 +0000 |
| commit | ec3a359ec08b9518e18777faa0b2f1068ccf23af (patch) | |
| tree | 1593753594e9640bc94e6404078f5a13d95440fe | |
| parent | 9addfd3d9f392f474738387fe9d30561dd7f6d91 (diff) | |
Remove ax and al from GENERIC; match with dc instead.
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_dc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 20039f65f1d..bc791d99c4c 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.150 1999/12/30 05:23:38 fgsch Exp $ +# $OpenBSD: GENERIC,v 1.151 2000/01/03 01:22:53 aaron Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -249,8 +249,6 @@ mx* at pci? dev ? function ? # Macronix PMAC ethernet vr* at pci? dev ? function ? # VIA Rhine ethernet wb* at pci? dev ? function ? # Winbond W89C840F ethernet ti* at pci? dev ? function ? # Alteon Tigon 1Gb ethernet -ax* at pci? dev ? function ? # ASIX AX88140A ethernet -al* at pci? dev ? function ? # ADMtek AL981/AN985 ethernet sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet sis* at pci? dev ? function ? # SiS 900/7016 ethernet ste* at pci? dev ? function ? # Sundance ST201 ethernet diff --git a/sys/dev/pci/if_dc.c b/sys/dev/pci/if_dc.c index 358e14b445a..e046b2af791 100644 --- a/sys/dev/pci/if_dc.c +++ b/sys/dev/pci/if_dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc.c,v 1.4 1999/12/15 17:36:10 jason Exp $ */ +/* $OpenBSD: if_dc.c,v 1.5 2000/01/03 01:22:53 aaron Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -161,9 +161,11 @@ struct dc_type dc_devs[] = { { PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21142 }, { PCI_VENDOR_DAVICOM, PCI_PRODUCT_DAVICOM_DM9100 }, { PCI_VENDOR_DAVICOM, PCI_PRODUCT_DAVICOM_DM9102 }, +#endif { PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AL981 }, { PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AN985 }, { PCI_VENDOR_ASIX, PCI_PRODUCT_ASIX_AX88140A }, +#if 0 { PCI_VENDOR_MACRONIX, PCI_PRODUCT_MACRONIX_MX98713 }, { PCI_VENDOR_MACRONIX, PCI_PRODUCT_MACRONIX_MX98715 }, { PCI_VENDOR_COMPEX, PCI_PRODUCT_COMPEX_98713 }, |