Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2847ff5d 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_AMPLICON 



Add a define for the Amplicon Liveline Limited 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 00f5c774

drivers/staging/comedi/comedidev.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#define PCI_VENDOR_ID_MEILHAUS		0x1402

#define PCI_VENDOR_ID_RTD		0x1435

#define PCI_VENDOR_ID_ADLINK		0x144a

#define PCI_VENDOR_ID_AMPLICON		0x14dc



#define COMEDI_NUM_MINORS 0x100

#define COMEDI_NUM_BOARD_MINORS 0x30

drivers/staging/comedi/drivers/amplc_dio200.c

+0 −1
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ 
#define DO_PCI	IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI)



/* PCI IDs */

#define PCI_VENDOR_ID_AMPLICON 0x14dc

#define PCI_DEVICE_ID_AMPLICON_PCI272 0x000a

#define PCI_DEVICE_ID_AMPLICON_PCI215 0x000b

#define PCI_DEVICE_ID_AMPLICON_PCIE236 0x0011

drivers/staging/comedi/drivers/amplc_pc236.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ unused. 
#define DO_PCI	IS_ENABLED(CONFIG_COMEDI_AMPLC_PC236_PCI)



/* PCI236 PCI configuration register information */

#define PCI_VENDOR_ID_AMPLICON 0x14dc

#define PCI_DEVICE_ID_AMPLICON_PCI236 0x0009

#define PCI_DEVICE_ID_INVALID 0xffff

drivers/staging/comedi/drivers/amplc_pc263.c

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ The state of the outputs can be read. 
#define DO_PCI	IS_ENABLED(CONFIG_COMEDI_AMPLC_PC263_PCI)



/* PCI263 PCI configuration register information */

#define PCI_VENDOR_ID_AMPLICON 0x14dc

#define PCI_DEVICE_ID_AMPLICON_PCI263 0x000c

#define PCI_DEVICE_ID_INVALID 0xffff

drivers/staging/comedi/drivers/amplc_pci224.c

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ Caveats: 
/*

 * PCI IDs.

 */

#define PCI_VENDOR_ID_AMPLICON 0x14dc

#define PCI_DEVICE_ID_AMPLICON_PCI224 0x0007

#define PCI_DEVICE_ID_AMPLICON_PCI234 0x0008

#define PCI_DEVICE_ID_INVALID 0xffff