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>

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index b925f6cb0c5924e140b2d1a0cab1f5ea5b0b2478..fa572073c0f90d483a00485c520573f51d412168 100644 (file)
--- 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

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index ba7fd9d53d1955c88062fbbf7b1e5a03854fef0d..322c8849b520fc4beda1fa2547364bddb8081f15 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/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/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 271db1cb6070868f21fa43c61202ecb163a7848f..ddb3dd79874d5aa8e8858dbf8ea36192a27672ae 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/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