summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/comedidev.h
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-10-24 18:11:21 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-24 19:38:16 -0700
commitb77d93a0306766456d7d6da21fb6f16c5e129fe6 (patch)
treebe381978abbd1b938e5d7ffa499057b5d7827aff /drivers/staging/comedi/comedidev.h
parent12f07ba56bad3defc37416e496c6e790029715b4 (diff)
staging: comedi: comedidev.h: add PCI_VENDOR_ID_MEILHAUS
Add a define for the Meilhaus Electronic GmbH Germany 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>
Diffstat (limited to 'drivers/staging/comedi/comedidev.h')
-rw-r--r--drivers/staging/comedi/comedidev.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index b925f6cb0c59..fa572073c0f9 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/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