Staging: comedi: move another pci vendor id

Move the vendor id to the drivers needing it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 8f842f85a105b3ce30c7f338699a80de745c8772..5592cd162cdbfc916e65dc6173880c7135f5b154 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -109,7 +109,6 @@
        COMEDI_MODULE_MACROS \
        COMEDI_PCI_INITCLEANUP_NOMODULE(comedi_driver, pci_id_table)
 
-#define PCI_VENDOR_ID_ADVANTECH                0x13fe
 #define PCI_VENDOR_ID_AMPLICON         0x14dc
 #define PCI_VENDOR_ID_ADLINK           0x144a
 #define PCI_VENDOR_ID_ICP              0x104c

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index f5bb286bfbd7e4f12dbce58541c4953e65595fe6..5c1ff779af2c89a9a72fe967725b1e818dcf60f7 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -63,6 +63,8 @@ Configuration options:
 #define DPRINTK(fmt, args...)
 #endif
 
+#define PCI_VENDOR_ID_ADVANTECH                0x13fe
+
 /* hardware types of the cards */
 #define TYPE_PCI171X   0
 #define TYPE_PCI1713   2

diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 1644490ed0adbeb98065b8f02217414d2055a3f1..9fe8fcc7f1d602e0018a10750df8559a8c4fdc6e 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -52,7 +52,7 @@ TODO:
 
 #include "comedi_pci.h"
 
-#define ADVANTECH_VENDOR        0x13fe /* Advantech PCI vendor ID */
+#define PCI_VENDOR_ID_ADVANTECH                0x13fe  /* Advantech PCI vendor ID */
 
 /* hardware types of the cards */
 #define TYPE_PCI1723 0
@@ -139,7 +139,7 @@ struct pci1723_board {
 static const struct pci1723_board boardtypes[] = {
        {
         .name = "pci1723",
-        .vendor_id = ADVANTECH_VENDOR,
+        .vendor_id = PCI_VENDOR_ID_ADVANTECH,
         .device_id = 0x1723,
         .iorange = IORANGE_1723,
         .cardtype = TYPE_PCI1723,

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index dbfeef8c5bc8a0473afcab50bc4ff30c83c74754..40eeecf5347fc73fbe24c12bdd38cf41698bfe14 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -45,6 +45,8 @@ Configuration options:
 #define DPRINTK(fmt, args...)
 #endif
 
+#define PCI_VENDOR_ID_ADVANTECH                0x13fe
+
 /* hardware types of the cards */
 enum hw_cards_id {
        TYPE_PCI1730, TYPE_PCI1733, TYPE_PCI1734, TYPE_PCI1736,