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>

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 1502fc4a85fc5b8a3bb7a9bc2f1fa330199a2b72..b7bb120f48be996c0bd5e66088c3e0755d641225 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -377,12 +377,7 @@ int comedi_driver_unregister(struct comedi_driver *);
 #define PCI_VENDOR_ID_DT               0x1116
 #define PCI_VENDOR_ID_IOTECH           0x1616
 #define PCI_VENDOR_ID_CONTEC           0x1221
-#define PCI_VENDOR_ID_CB               0x1307  /* Measurement Computing */
-#define PCI_VENDOR_ID_ADVANTECH                0x13fe
-#define PCI_VENDOR_ID_MEILHAUS         0x1402
 #define PCI_VENDOR_ID_RTD              0x1435
-#define PCI_VENDOR_ID_ADLINK           0x144a
-#define PCI_VENDOR_ID_AMPLICON         0x14dc
 
 struct pci_dev;
 struct pci_driver;

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 0eb65796bcb9af7f5876c300608e7caebdfe6297..747c8b7e97bdeff187b5150d932c4e0a5f52917e 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1807,6 +1807,8 @@
 #define PCI_VENDOR_ID_ESDGMBH          0x12fe
 #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
 
+#define PCI_VENDOR_ID_CB               0x1307  /* Measurement Computing */
+
 #define PCI_VENDOR_ID_SIIG             0x131f
 #define PCI_SUBVENDOR_ID_SIIG          0x131f
 #define PCI_DEVICE_ID_SIIG_1S_10x_550  0x1000
@@ -2013,6 +2015,10 @@
 #define PCI_DEVICE_ID_CMEDIA_CM8738    0x0111
 #define PCI_DEVICE_ID_CMEDIA_CM8738B   0x0112
 
+#define PCI_VENDOR_ID_ADVANTECH                0x13fe
+
+#define PCI_VENDOR_ID_MEILHAUS         0x1402
+
 #define PCI_VENDOR_ID_LAVA             0x1407
 #define PCI_DEVICE_ID_LAVA_DSERIAL     0x0100 /* 2x 16550 */
 #define PCI_DEVICE_ID_LAVA_QUATRO_A    0x0101 /* 2x 16550, half of 4 port */
@@ -2058,6 +2064,8 @@
 
 #define PCI_VENDOR_ID_CHELSIO          0x1425
 
+#define PCI_VENDOR_ID_ADLINK           0x144a
+
 #define PCI_VENDOR_ID_SAMSUNG          0x144d
 
 #define PCI_VENDOR_ID_GIGABYTE         0x1458
@@ -2091,6 +2099,8 @@
 #define PCI_DEVICE_ID_AFAVLAB_P030     0x2182
 #define PCI_SUBDEVICE_ID_AFAVLAB_P061          0x2150
 
+#define PCI_VENDOR_ID_AMPLICON         0x14dc
+
 #define PCI_VENDOR_ID_BCM_GVC          0x14a4
 #define PCI_VENDOR_ID_BROADCOM         0x14e4
 #define PCI_DEVICE_ID_TIGON3_5752      0x1600