aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-10-24 21:12:34 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-24 22:38:17 -0400
commitf656ef5b6c15e518dde43a6d6ae6c47dccc6c920 (patch)
tree0fb3c22744fc616895d94906579fe5bff2effdb5 /drivers
parent64f2f9335915b87373f73cfb47f0a2d9ed190f2b (diff)
staging: comedi: comedidev.h: add PCI_VENDOR_ID_DT
Add a define for the Data Translation, 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/comedidev.h1
-rw-r--r--drivers/staging/comedi/drivers/dt3000.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index fa572073c0f9..23b13b090c75 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -58,6 +58,7 @@
58 * PCI Vendor IDs not in <linux/pci_ids.h> 58 * PCI Vendor IDs not in <linux/pci_ids.h>
59 */ 59 */
60#define PCI_VENDOR_ID_ICP 0x104c 60#define PCI_VENDOR_ID_ICP 0x104c
61#define PCI_VENDOR_ID_DT 0x1116
61#define PCI_VENDOR_ID_CONTEC 0x1221 62#define PCI_VENDOR_ID_CONTEC 0x1221
62#define PCI_VENDOR_ID_CB 0x1307 /* Measurement Computing */ 63#define PCI_VENDOR_ID_CB 0x1307 /* Measurement Computing */
63#define PCI_VENDOR_ID_ADVANTECH 0x13fe 64#define PCI_VENDOR_ID_ADVANTECH 0x13fe
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 46645759781d..29e6f8ea67e1 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -65,8 +65,6 @@ AO commands are not supported.
65 65
66#include "comedi_fc.h" 66#include "comedi_fc.h"
67 67
68#define PCI_VENDOR_ID_DT 0x1116
69
70static const struct comedi_lrange range_dt3000_ai = { 4, { 68static const struct comedi_lrange range_dt3000_ai = { 4, {
71 RANGE(-10, 10), 69 RANGE(-10, 10),
72 RANGE(-5, 5), 70 RANGE(-5, 5),