From 8e0d5f85346320b869aeaebf0cefd89549e03fd5 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 24 Oct 2012 18:13:12 -0700 Subject: [PATCH] --- yaml --- r: 337275 b: refs/heads/master c: 34f8d2089d0f7820da9cc24964da9f33d59c03b2 h: refs/heads/master i: 337273: 8c34c774877dcbd4aa96a92f7831444f3bb4b645 337271: 15de284397d8658aa770d5eab6ed9326b3998066 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 1 + trunk/drivers/staging/comedi/drivers/daqboard2000.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c1966d108dbc..e05b02882f71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d374622a8a45dec37702a40c803fb9e9e9cb8e0 +refs/heads/master: 34f8d2089d0f7820da9cc24964da9f33d59c03b2 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index be0dfe52076e..41f0b5765324 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -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 diff --git a/trunk/drivers/staging/comedi/drivers/daqboard2000.c b/trunk/drivers/staging/comedi/drivers/daqboard2000.c index 87b9cd572f80..8bc6189c578e 100644 --- a/trunk/drivers/staging/comedi/drivers/daqboard2000.c +++ b/trunk/drivers/staging/comedi/drivers/daqboard2000.c @@ -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 */