diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-09-22 18:02:06 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 2000-09-22 18:02:06 +0000 |
| commit | 14acf2678a25bbaff9275caf50aae552cd1c8844 (patch) | |
| tree | 23005114bf8150c86153206de1899c91dcfa4f10 /sys/dev | |
| parent | 9188e5012e43b6d1d9d5e96e1d5f905e7200f665 (diff) | |
sync
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 5 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 1183eb8637e..91dfe03814c 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.321 2000/09/19 08:37:30 niklas Exp + * OpenBSD: pcidevs,v 1.322 2000/09/22 15:09:38 aaron Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -528,6 +528,7 @@ #define PCI_VENDOR_INVERTEX 0x14e1 /* Invertex */ #define PCI_VENDOR_AIRONET 0x14b9 /* Aironet */ #define PCI_VENDOR_BROADCOM 0x14e4 /* Broadcom */ +#define PCI_VENDOR_CONEXANT 0x14f1 /* Conexant */ #define PCI_VENDOR_DELTA 0x1500 /* Delta */ #define PCI_VENDOR_BLUESTEEL 0x15ab /* Bluesteel Networks */ #define PCI_VENDOR_VMWARE 0x15ad /* VMware */ @@ -1530,7 +1531,7 @@ /* Sony products */ #define PCI_PRODUCT_SONY_CXD1947A 0x8009 /* CXD1947A FireWire */ #define PCI_PRODUCT_SONY_CXD3222 0x8039 /* CXD3222 FireWire */ -#define PCI_PRODUCT_SONY_MEMSTICK_SLOT 0x808a /* Memory Stick Media Slot */ +#define PCI_PRODUCT_SONY_MEMSTICK_SLOT 0x808a /* Memory Stick Slot */ /* STB products */ #define PCI_PRODUCT_STB2_RIVA128 0x0018 /* Velocity128 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index f6f002e0cbe..d9e1f8d63c2 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.321 2000/09/19 08:37:30 niklas Exp + * OpenBSD: pcidevs,v 1.322 2000/09/22 15:09:38 aaron Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -4320,7 +4320,7 @@ struct pci_knowndev pci_knowndevs[] = { PCI_VENDOR_SONY, PCI_PRODUCT_SONY_MEMSTICK_SLOT, 0, "Sony", - "Memory Stick Media Slot", + "Memory Stick Slot", }, { PCI_VENDOR_STB2, PCI_PRODUCT_STB2_RIVA128, @@ -8403,6 +8403,12 @@ struct pci_knowndev pci_knowndevs[] = { NULL, }, { + PCI_VENDOR_CONEXANT, 0, + PCI_KNOWNDEV_NOPROD, + "Conexant", + NULL, + }, + { PCI_VENDOR_DELTA, 0, PCI_KNOWNDEV_NOPROD, "Delta", |