staging: comedi: comedidev.h: add PCI_VENDOR_ID_ADVANTECH
authorH Hartley Sweeten <hartleys@visionengravers.com>
Thu, 25 Oct 2012 01:11:01 +0000 (18:11 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Oct 2012 02:38:16 +0000 (19:38 -0700)
Add a define for the Advantech Co., Ltd. PCI vendor id. Remove the
duplicates in the drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/comedidev.h
drivers/staging/comedi/drivers/adv_pci1710.c
drivers/staging/comedi/drivers/adv_pci1723.c
drivers/staging/comedi/drivers/adv_pci_dio.c

index 78bc06299eaba6286862c04a0a8c33b1c5c6bf2a..b925f6cb0c5924e140b2d1a0cab1f5ea5b0b2478 100644 (file)
@@ -60,6 +60,7 @@
 #define PCI_VENDOR_ID_ICP              0x104c
 #define PCI_VENDOR_ID_CONTEC           0x1221
 #define PCI_VENDOR_ID_CB               0x1307  /* Measurement Computing */
+#define PCI_VENDOR_ID_ADVANTECH                0x13fe
 #define PCI_VENDOR_ID_ADLINK           0x144a
 
 #define COMEDI_NUM_MINORS 0x100
index 6131a0a7aa964357b9aaaacab5a4953e1ea73ba9..dd83c749e6eda44c63be78270c527c5b83e7a993 100644 (file)
@@ -53,8 +53,6 @@ Configuration options:
                                 * correct channel number on every 12 bit
                                 * sample */
 
-#define PCI_VENDOR_ID_ADVANTECH                0x13fe
-
 /* hardware types of the cards */
 #define TYPE_PCI171X   0
 #define TYPE_PCI1713   2
index 2eaf56dcc952e94ebebe0b1fe983545386cec35d..7109e7d8b9fc71b29f487ad106c3ad926934bef3 100644 (file)
@@ -50,8 +50,6 @@ TODO:
 
 #include "../comedidev.h"
 
-#define PCI_VENDOR_ID_ADVANTECH                0x13fe  /* Advantech PCI vendor ID */
-
 /* all the registers for the pci1723 board */
 #define PCI1723_DA(N)   ((N)<<1)       /* W: D/A register N (0 to 7) */
 
index 4b29f6d050507efbb7a313078a0ac1228ab9b1eb..131eb02324dd815bf3df9a09fbcd56e9d68a73ce 100644 (file)
@@ -36,8 +36,6 @@ Configuration options:
 #include "8255.h"
 #include "8253.h"
 
-#define PCI_VENDOR_ID_ADVANTECH                0x13fe
-
 /* hardware types of the cards */
 enum hw_cards_id {
        TYPE_PCI1730, TYPE_PCI1733, TYPE_PCI1734, TYPE_PCI1735, TYPE_PCI1736,