iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: comedidev.h: add PCI_VENDOR_ID_MEILHAUS

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-10-24 18:11:21 -07:00 committed by Greg Kroah-Hartman
parent 12f07ba56b
commit b77d93a030
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/comedi/comedidev.h
View File

@ -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

2
drivers/staging/comedi/drivers/me4000.c
View File

@ -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

1
drivers/staging/comedi/drivers/me_daq.c
View File

@ -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