From 91246a1d47a1089428c4fac1bddfa7fa104ec719 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 24 Oct 2012 18:11:21 -0700 Subject: [PATCH] --- yaml --- r: 337269 b: refs/heads/master c: b77d93a0306766456d7d6da21fb6f16c5e129fe6 h: refs/heads/master i: 337267: 2c7e581371efa5b195cef3ec15909f56c93b6896 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 1 + trunk/drivers/staging/comedi/drivers/me4000.c | 2 -- trunk/drivers/staging/comedi/drivers/me_daq.c | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a881cea4770d..e4742f8bc748 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12f07ba56bad3defc37416e496c6e790029715b4 +refs/heads/master: b77d93a0306766456d7d6da21fb6f16c5e129fe6 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index b925f6cb0c59..fa572073c0f9 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -61,6 +61,7 @@ #define PCI_VENDOR_ID_CONTEC 0x1221 #define PCI_VENDOR_ID_CB 0x1307 /* Measurement Computing */ #define PCI_VENDOR_ID_ADVANTECH 0x13fe +#define PCI_VENDOR_ID_MEILHAUS 0x1402 #define PCI_VENDOR_ID_ADLINK 0x144a #define COMEDI_NUM_MINORS 0x100 diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c index ba7fd9d53d19..322c8849b520 100644 --- a/trunk/drivers/staging/comedi/drivers/me4000.c +++ b/trunk/drivers/staging/comedi/drivers/me4000.c @@ -60,8 +60,6 @@ broken. #include "me4000_fw.h" #endif -#define PCI_VENDOR_ID_MEILHAUS 0x1402 - #define PCI_DEVICE_ID_MEILHAUS_ME4650 0x4650 #define PCI_DEVICE_ID_MEILHAUS_ME4660 0x4660 #define PCI_DEVICE_ID_MEILHAUS_ME4660I 0x4661 diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c index 271db1cb6070..ddb3dd79874d 100644 --- a/trunk/drivers/staging/comedi/drivers/me_daq.c +++ b/trunk/drivers/staging/comedi/drivers/me_daq.c @@ -50,7 +50,6 @@ Configuration options: #define ME2600_FIRMWARE "me2600_firmware.bin" -#define PCI_VENDOR_ID_MEILHAUS 0x1402 #define ME2000_DEVICE_ID 0x2000 #define ME2600_DEVICE_ID 0x2600