From ecd06e129f174528ae7db14c041bb2d41890cb75 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 24 Oct 2012 18:12:50 -0700 Subject: [PATCH] --- yaml --- r: 337274 b: refs/heads/master c: 0d374622a8a45dec37702a40c803fb9e9e9cb8e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 1 + trunk/drivers/staging/comedi/drivers/ke_counter.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 79f1fa996a93..c1966d108dbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f656ef5b6c15e518dde43a6d6ae6c47dccc6c920 +refs/heads/master: 0d374622a8a45dec37702a40c803fb9e9e9cb8e0 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 23b13b090c75..be0dfe52076e 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -57,6 +57,7 @@ /* * PCI Vendor IDs not in */ +#define PCI_VENDOR_ID_KOLTER 0x1001 #define PCI_VENDOR_ID_ICP 0x104c #define PCI_VENDOR_ID_DT 0x1116 #define PCI_VENDOR_ID_CONTEC 0x1221 diff --git a/trunk/drivers/staging/comedi/drivers/ke_counter.c b/trunk/drivers/staging/comedi/drivers/ke_counter.c index 355af553ed53..8780a12ef59c 100644 --- a/trunk/drivers/staging/comedi/drivers/ke_counter.c +++ b/trunk/drivers/staging/comedi/drivers/ke_counter.c @@ -36,7 +36,6 @@ Kolter Electronic PCI Counter Card. #include "../comedidev.h" -#define PCI_VENDOR_ID_KOLTER 0x1001 #define CNT_CARD_DEVICE_ID 0x0014 /*-- counter write ----------------------------------------------------------*/