diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-07-28 16:56:07 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-07-28 16:56:07 +0000 |
| commit | 5bd2230c632d5522aead0deec5835b3119ff1ae8 (patch) | |
| tree | f0fc2dbaf01719a5246be137c90e396423244ddd | |
| parent | d29b13b7a179bd7ed9ba04a844e78428b57c5fd9 (diff) | |
sync
| -rw-r--r-- | sys/dev/ic/ar5xxx.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ic/ar5xxx.c b/sys/dev/ic/ar5xxx.c index 70ce2bfd2d6..39e66050a66 100644 --- a/sys/dev/ic/ar5xxx.c +++ b/sys/dev/ic/ar5xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5xxx.c,v 1.48 2008/07/28 10:02:32 reyk Exp $ */ +/* $OpenBSD: ar5xxx.c,v 1.49 2008/07/28 16:56:06 reyk Exp $ */ /* * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -68,7 +68,7 @@ static const struct { ar5k_ar5212_attach }, { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5416, ar5k_ar5212_attach }, - { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5416_PCIE, + { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5418, ar5k_ar5212_attach }, { PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3CRDAG675, ar5k_ar5212_attach }, diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index 1a6da235fda..734f17505ed 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.1395 2008/07/28 16:03:48 kettenis Exp + * OpenBSD: pcidevs,v 1.1396 2008/07/28 16:53:18 reyk Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -1118,10 +1118,10 @@ #define PCI_PRODUCT_ATHEROS_AR5413 0x001b /* AR5413 */ #define PCI_PRODUCT_ATHEROS_AR5424 0x001c /* AR5424 */ #define PCI_PRODUCT_ATHEROS_AR5416 0x0023 /* AR5416 */ -#define PCI_PRODUCT_ATHEROS_AR5416_PCIE 0x0024 /* AR5416 PCIE */ +#define PCI_PRODUCT_ATHEROS_AR5418 0x0024 /* AR5418 */ #define PCI_PRODUCT_ATHEROS_AR9160 0x0027 /* AR9160 */ #define PCI_PRODUCT_ATHEROS_AR9280 0x0029 /* AR9280 */ -#define PCI_PRODUCT_ATHEROS_AR9280_PCIE 0x002a /* AR9280 PCIE */ +#define PCI_PRODUCT_ATHEROS_AR9281 0x002a /* AR9281 */ #define PCI_PRODUCT_ATHEROS_AR5210_AP 0x0207 /* AR5210 (Early) */ #define PCI_PRODUCT_ATHEROS_AR5212_IBM 0x1014 /* AR5212 (IBM MiniPCI) */ #define PCI_PRODUCT_ATHEROS_AR5210_DEFAULT 0x1107 /* AR5210 (no eeprom) */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index f5121111d16..8a2af75d501 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.1395 2008/07/28 16:03:48 kettenis Exp + * OpenBSD: pcidevs,v 1.1396 2008/07/28 16:53:18 reyk Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -2852,8 +2852,8 @@ static const struct pci_known_product pci_known_products[] = { "AR5416", }, { - PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5416_PCIE, - "AR5416 PCIE", + PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5418, + "AR5418", }, { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9160, @@ -2864,8 +2864,8 @@ static const struct pci_known_product pci_known_products[] = { "AR9280", }, { - PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9280_PCIE, - "AR9280 PCIE", + PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR9281, + "AR9281", }, { PCI_VENDOR_ATHEROS, PCI_PRODUCT_ATHEROS_AR5210_AP, |