summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-10-24 18:12:50 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-24 19:39:19 -0700
commit0d374622a8a45dec37702a40c803fb9e9e9cb8e0 (patch)
tree6ca28709e46438f5ec665c2938f21ab4ebd37279
parentf656ef5b6c15e518dde43a6d6ae6c47dccc6c920 (diff)
downloadop-kernel-dev-0d374622a8a45dec37702a40c803fb9e9e9cb8e0.zip
op-kernel-dev-0d374622a8a45dec37702a40c803fb9e9e9cb8e0.tar.gz
staging: comedi: comedidev.h: add PCI_VENDOR_ID_KOLTER
Add a define for the Kolter Electronic 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>
-rw-r--r--drivers/staging/comedi/comedidev.h1
-rw-r--r--drivers/staging/comedi/drivers/ke_counter.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 23b13b0..be0dfe5 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -57,6 +57,7 @@
/*
* PCI Vendor IDs not in <linux/pci_ids.h>
*/
+#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/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 355af55..8780a12 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/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 ----------------------------------------------------------*/
OpenPOWER on IntegriCloud