diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-31 16:42:16 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-03 20:49:16 -0500 |
commit | 7f70410fe03f9f31a99bb5074b5e3c48f3b90541 (patch) | |
tree | 20d619e927879c4733d5bc05e36d95d8143d29c4 /include/linux/pci_ids.h | |
parent | 4c4bc25d0fa6beaf054c0b4c3b324487f266c820 (diff) |
pci_ids.h: add common pci vendor ids from comedi subsystem
There are a number of pci vendor ids that are used in multiple
drivers in the comedi subsystem. Move these ids to pci_ids.h.
This also fixes some build warnings reported by the kbuild test
robot about PCI_VENDOR_ID_AMPLICON being undeclared.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/pci_ids.h')
-rw-r--r-- | include/linux/pci_ids.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 0eb65796bcb9..747c8b7e97bd 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1807,6 +1807,8 @@ | |||
1807 | #define PCI_VENDOR_ID_ESDGMBH 0x12fe | 1807 | #define PCI_VENDOR_ID_ESDGMBH 0x12fe |
1808 | #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 | 1808 | #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111 |
1809 | 1809 | ||
1810 | #define PCI_VENDOR_ID_CB 0x1307 /* Measurement Computing */ | ||
1811 | |||
1810 | #define PCI_VENDOR_ID_SIIG 0x131f | 1812 | #define PCI_VENDOR_ID_SIIG 0x131f |
1811 | #define PCI_SUBVENDOR_ID_SIIG 0x131f | 1813 | #define PCI_SUBVENDOR_ID_SIIG 0x131f |
1812 | #define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000 | 1814 | #define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000 |
@@ -2013,6 +2015,10 @@ | |||
2013 | #define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111 | 2015 | #define PCI_DEVICE_ID_CMEDIA_CM8738 0x0111 |
2014 | #define PCI_DEVICE_ID_CMEDIA_CM8738B 0x0112 | 2016 | #define PCI_DEVICE_ID_CMEDIA_CM8738B 0x0112 |
2015 | 2017 | ||
2018 | #define PCI_VENDOR_ID_ADVANTECH 0x13fe | ||
2019 | |||
2020 | #define PCI_VENDOR_ID_MEILHAUS 0x1402 | ||
2021 | |||
2016 | #define PCI_VENDOR_ID_LAVA 0x1407 | 2022 | #define PCI_VENDOR_ID_LAVA 0x1407 |
2017 | #define PCI_DEVICE_ID_LAVA_DSERIAL 0x0100 /* 2x 16550 */ | 2023 | #define PCI_DEVICE_ID_LAVA_DSERIAL 0x0100 /* 2x 16550 */ |
2018 | #define PCI_DEVICE_ID_LAVA_QUATRO_A 0x0101 /* 2x 16550, half of 4 port */ | 2024 | #define PCI_DEVICE_ID_LAVA_QUATRO_A 0x0101 /* 2x 16550, half of 4 port */ |
@@ -2058,6 +2064,8 @@ | |||
2058 | 2064 | ||
2059 | #define PCI_VENDOR_ID_CHELSIO 0x1425 | 2065 | #define PCI_VENDOR_ID_CHELSIO 0x1425 |
2060 | 2066 | ||
2067 | #define PCI_VENDOR_ID_ADLINK 0x144a | ||
2068 | |||
2061 | #define PCI_VENDOR_ID_SAMSUNG 0x144d | 2069 | #define PCI_VENDOR_ID_SAMSUNG 0x144d |
2062 | 2070 | ||
2063 | #define PCI_VENDOR_ID_GIGABYTE 0x1458 | 2071 | #define PCI_VENDOR_ID_GIGABYTE 0x1458 |
@@ -2091,6 +2099,8 @@ | |||
2091 | #define PCI_DEVICE_ID_AFAVLAB_P030 0x2182 | 2099 | #define PCI_DEVICE_ID_AFAVLAB_P030 0x2182 |
2092 | #define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150 | 2100 | #define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150 |
2093 | 2101 | ||
2102 | #define PCI_VENDOR_ID_AMPLICON 0x14dc | ||
2103 | |||
2094 | #define PCI_VENDOR_ID_BCM_GVC 0x14a4 | 2104 | #define PCI_VENDOR_ID_BCM_GVC 0x14a4 |
2095 | #define PCI_VENDOR_ID_BROADCOM 0x14e4 | 2105 | #define PCI_VENDOR_ID_BROADCOM 0x14e4 |
2096 | #define PCI_DEVICE_ID_TIGON3_5752 0x1600 | 2106 | #define PCI_DEVICE_ID_TIGON3_5752 0x1600 |