The kernel provides this id in pci_ids.h. Use it instead of creating
duplicates of the id with different names.
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>
static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
#ifdef CONFIG_APCI_3120
static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
#ifdef CONFIG_APCI_3120
- {PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x818D)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x818D)},
#endif
#ifdef CONFIG_APCI_1032
{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003)},
#endif
#ifdef CONFIG_APCI_1032
{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1003)},
{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006)},
#endif
#ifdef CONFIG_APCI_1500
{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1006)},
#endif
#ifdef CONFIG_APCI_1500
- {PCI_DEVICE(APCI1500_BOARD_VENDOR_ID, 0x80fc)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x80fc)},
#endif
#ifdef CONFIG_APCI_3001
#endif
#ifdef CONFIG_APCI_3001
- {PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x828D)},
+ {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA_OLD, 0x828D)},
#endif
#ifdef CONFIG_APCI_3501
{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001)},
#endif
#ifdef CONFIG_APCI_3501
{PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001)},
#ifdef CONFIG_APCI_3120
{
.pc_DriverName = "apci3120",
#ifdef CONFIG_APCI_3120
{
.pc_DriverName = "apci3120",
- .i_VendorId = APCI3120_BOARD_VENDOR_ID,
+ .i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD,
.i_DeviceId = 0x818D,
.i_IorangeBase0 = AMCC_OP_REG_SIZE,
.i_IorangeBase1 = APCI3120_ADDRESS_RANGE,
.i_DeviceId = 0x818D,
.i_IorangeBase0 = AMCC_OP_REG_SIZE,
.i_IorangeBase1 = APCI3120_ADDRESS_RANGE,
#ifdef CONFIG_APCI_1500
{
.pc_DriverName = "apci1500",
#ifdef CONFIG_APCI_1500
{
.pc_DriverName = "apci1500",
- .i_VendorId = APCI1500_BOARD_VENDOR_ID,
+ .i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD,
.i_DeviceId = 0x80fc,
.i_IorangeBase0 = 128,
.i_IorangeBase1 = APCI1500_ADDRESS_RANGE,
.i_DeviceId = 0x80fc,
.i_IorangeBase0 = 128,
.i_IorangeBase1 = APCI1500_ADDRESS_RANGE,
#ifdef CONFIG_APCI_3001
{
.pc_DriverName = "apci3001",
#ifdef CONFIG_APCI_3001
{
.pc_DriverName = "apci3001",
- .i_VendorId = APCI3120_BOARD_VENDOR_ID,
+ .i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD,
.i_DeviceId = 0x828D,
.i_IorangeBase0 = AMCC_OP_REG_SIZE,
.i_IorangeBase1 = APCI3120_ADDRESS_RANGE,
.i_DeviceId = 0x828D,
.i_IorangeBase0 = AMCC_OP_REG_SIZE,
.i_IorangeBase1 = APCI3120_ADDRESS_RANGE,
/********* Definitions for APCI-1500 card *****/
/* Card Specific information */
/********* Definitions for APCI-1500 card *****/
/* Card Specific information */
-#define APCI1500_BOARD_VENDOR_ID 0x10e8
#define APCI1500_ADDRESS_RANGE 4
/* DIGITAL INPUT-OUTPUT DEFINE */
#define APCI1500_ADDRESS_RANGE 4
/* DIGITAL INPUT-OUTPUT DEFINE */
#define APCI3120_BIPOLAR_RANGES 4 /* used for test on mixture of BIP/UNI ranges */
#define APCI3120_BIPOLAR_RANGES 4 /* used for test on mixture of BIP/UNI ranges */
-#define APCI3120_BOARD_VENDOR_ID 0x10E8
#define APCI3120_ADDRESS_RANGE 16
#define APCI3120_DISABLE 0
#define APCI3120_ADDRESS_RANGE 16
#define APCI3120_DISABLE 0