From 9ac5451abf29866ff411f1aceb6327918edc8a03 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 30 Apr 2010 17:07:25 -0700 Subject: [PATCH] --- yaml --- r: 197159 b: refs/heads/master c: 3ca88dd5c3c6739f685793539a679ab5ac85aca3 h: refs/heads/master i: 197157: 7b5f3e70e5f494005fa9082d5ee188f05cb32604 197155: 70fc7e17bab2ad239fed19f278fdc962801593a3 197151: c12216232bb47bc593ad94791fbde6e4677425b9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 1 - trunk/drivers/staging/comedi/drivers/me_daq.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e7925cf36f9e..b73e59a5fdf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a102e0ef173ff936efb6ea33b6a9db865c82645 +refs/heads/master: 3ca88dd5c3c6739f685793539a679ab5ac85aca3 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 162ac8d913e5..09d3c51097f7 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -115,7 +115,6 @@ #define PCI_VENDOR_ID_ADLINK 0x144a #define PCI_VENDOR_ID_ICP 0x104c #define PCI_VENDOR_ID_CONTEC 0x1221 -#define PCI_VENDOR_ID_MEILHAUS 0x1402 #define COMEDI_NUM_MINORS 0x100 #define COMEDI_NUM_BOARD_MINORS 0x30 diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c index 80e192d2e77e..c8484aec657d 100644 --- a/trunk/drivers/staging/comedi/drivers/me_daq.c +++ b/trunk/drivers/staging/comedi/drivers/me_daq.c @@ -60,6 +60,7 @@ from http://www.comedi.org #define ME_DRIVER_NAME "me_daq" +#define PCI_VENDOR_ID_MEILHAUS 0x1402 #define ME2000_DEVICE_ID 0x2000 #define ME2600_DEVICE_ID 0x2600