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

Commit 12197de2 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

pci_ids.h: move PCI_VENDOR_ID_AMCC here 



PCI_VENDOR_ID_AMCC is defined locally in
"drivers/staging/comedi/comedidev.h" for a few comedi hardware drivers,
namely "adl_pci9118", "addi_apci_1500" and "addi_apci_3120" (also
"addi_apci_1710" but that is not currently built and will probably be
removed soon).  Move the define into "include/linux/pci_ids.h" as it is
shared by several drivers (albeit all comedi drivers currently).

PCI_VENDOR_ID_AMCC happens to have the same value (0x10e8) as
PCI_VENDOR_ID_ADDIDATA_OLD.  The vendor ID is actually assigned to
Applied Micro Circuits Corporation and Addi-Data were using device IDs
assigned by AMCC on some of their earlier PCI boards. The
PCI_VENDOR_ID_ADDIDATA_OLD define is still being used by the "8250_pci"
PCI serial board driver.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4b05856

drivers/staging/comedi/comedidev.h

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ int comedi_driver_unregister(struct comedi_driver *); 
 */

#define PCI_VENDOR_ID_KOLTER		0x1001

#define PCI_VENDOR_ID_ICP		0x104c

#define PCI_VENDOR_ID_AMCC		0x10e8

#define PCI_VENDOR_ID_DT		0x1116

#define PCI_VENDOR_ID_IOTECH		0x1616

#define PCI_VENDOR_ID_CONTEC		0x1221

include/linux/pci_ids.h

+3 −1
Original line number Diff line number Diff line
@@ -1311,6 +1311,8 @@ 
#define PCI_DEVICE_ID_IMS_TT128		0x9128

#define PCI_DEVICE_ID_IMS_TT3D		0x9135



#define PCI_VENDOR_ID_AMCC		0x10e8



#define PCI_VENDOR_ID_INTERG		0x10ea

#define PCI_DEVICE_ID_INTERG_1682	0x1682

#define PCI_DEVICE_ID_INTERG_2000	0x2000
@@ -2256,7 +2258,7 @@ 
/*

 * ADDI-DATA GmbH communication cards <info@addi-data.com>

 */

#define PCI_VENDOR_ID_ADDIDATA_OLD             0x10E8

#define PCI_VENDOR_ID_ADDIDATA_OLD             0x10E8	/* actually AMCC */

#define PCI_VENDOR_ID_ADDIDATA                 0x15B8

#define PCI_DEVICE_ID_ADDIDATA_APCI7500        0x7000

#define PCI_DEVICE_ID_ADDIDATA_APCI7420        0x7001