]> Pileus Git - ~andy/linux/commitdiff
staging: comedi: comedidev.h: add PCI_VENDOR_ID_IOTECH
authorH Hartley Sweeten <hartleys@visionengravers.com>
Thu, 25 Oct 2012 01:13:12 +0000 (18:13 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Oct 2012 02:39:19 +0000 (19:39 -0700)
Add a define for the Iotech Inc. 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/daqboard2000.c

index be0dfe52076e68362a2a1b0dabad6c11494121c5..41f0b576532412592fbc97dbc691c874ffb3946c 100644 (file)
@@ -60,6 +60,7 @@
 #define PCI_VENDOR_ID_KOLTER           0x1001
 #define PCI_VENDOR_ID_ICP              0x104c
 #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
index 87b9cd572f800d714813aad4ad652ed543168a7d..8bc6189c578e6866d911face2c468f0e7a832b70 100644 (file)
@@ -117,8 +117,6 @@ Configuration options: not applicable, uses PCI auto config
 
 #define DAQBOARD2000_FIRMWARE          "daqboard2000_firmware.bin"
 
-#define PCI_VENDOR_ID_IOTECH           0x1616
-
 #define DAQBOARD2000_SUBSYSTEM_IDS2    0x0002  /* Daqboard/2000 - 2 Dacs */
 #define DAQBOARD2000_SUBSYSTEM_IDS4    0x0004  /* Daqboard/2000 - 4 Dacs */