Commit b77d93a0 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 12f07ba5

drivers/staging/comedi/comedidev.h

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/staging/comedi/drivers/me4000.c

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/staging/comedi/drivers/me_daq.c

+0 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE