diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 15:41:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 15:41:58 -0500 |
| commit | 1725d409caba16ea5fc694bd50e95e79e8ced11a (patch) | |
| tree | 688fe26dd4ceda5364692f0ce307aadb6f04f331 /include/linux/pci_ids.h | |
| parent | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (diff) | |
| parent | b8abde45d7d6ab9e8ceced9b5990eeb1149d0b97 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2370184e3654..966e02332990 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -834,6 +834,8 @@ | |||
| 834 | #define PCI_DEVICE_ID_PROMISE_20276 0x5275 | 834 | #define PCI_DEVICE_ID_PROMISE_20276 0x5275 |
| 835 | #define PCI_DEVICE_ID_PROMISE_20277 0x7275 | 835 | #define PCI_DEVICE_ID_PROMISE_20277 0x7275 |
| 836 | 836 | ||
| 837 | #define PCI_VENDOR_ID_FOXCONN 0x105b | ||
| 838 | |||
| 837 | #define PCI_VENDOR_ID_UMC 0x1060 | 839 | #define PCI_VENDOR_ID_UMC 0x1060 |
| 838 | #define PCI_DEVICE_ID_UMC_UM8673F 0x0101 | 840 | #define PCI_DEVICE_ID_UMC_UM8673F 0x0101 |
| 839 | #define PCI_DEVICE_ID_UMC_UM8886BF 0x673a | 841 | #define PCI_DEVICE_ID_UMC_UM8886BF 0x673a |
| @@ -1969,6 +1971,8 @@ | |||
| 1969 | 1971 | ||
| 1970 | #define PCI_VENDOR_ID_SAMSUNG 0x144d | 1972 | #define PCI_VENDOR_ID_SAMSUNG 0x144d |
| 1971 | 1973 | ||
| 1974 | #define PCI_VENDOR_ID_AMBIT 0x1468 | ||
| 1975 | |||
| 1972 | #define PCI_VENDOR_ID_MYRICOM 0x14c1 | 1976 | #define PCI_VENDOR_ID_MYRICOM 0x14c1 |
| 1973 | 1977 | ||
| 1974 | #define PCI_VENDOR_ID_TITAN 0x14D2 | 1978 | #define PCI_VENDOR_ID_TITAN 0x14D2 |