Skip to content

Commit

Permalink
staging: comedi: comedidev.h: add PCI_VENDOR_ID_MEILHAUS
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent 12f07ba commit b77d93a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 1 addition & 0 deletions drivers/staging/comedi/comedidev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/comedi/drivers/me4000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/comedi/drivers/me_daq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit b77d93a

Please sign in to comment.