mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
can: ems_pci: remove PCI_SUBVENDOR_ID_ASIX definition
PCI_SUBVENDOR_ID_ASIX is defined as 0xa000, which is not the vendor id assigned to ASIX by PCI-SIG. Remove it to avoid possible confusion and conflict. Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Link: https://lore.kernel.org/r/20230724083933.3173513-2-jiaqing.zhao@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
cd119fdc3e
commit
e6015e3ded
1 changed files with 1 additions and 2 deletions
|
@ -111,7 +111,6 @@ struct ems_pci_card {
|
|||
#ifndef PCI_VENDOR_ID_ASIX
|
||||
#define PCI_VENDOR_ID_ASIX 0x125b
|
||||
#define PCI_DEVICE_ID_ASIX_9110 0x9110
|
||||
#define PCI_SUBVENDOR_ID_ASIX 0xa000
|
||||
#endif
|
||||
#define PCI_SUBDEVICE_ID_EMS 0x4010
|
||||
|
||||
|
@ -123,7 +122,7 @@ static const struct pci_device_id ems_pci_tbl[] = {
|
|||
/* CPC-104P v2 */
|
||||
{PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030, PCI_VENDOR_ID_PLX, 0x4002},
|
||||
/* CPC-PCIe v3 */
|
||||
{PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_9110, PCI_SUBVENDOR_ID_ASIX, PCI_SUBDEVICE_ID_EMS},
|
||||
{PCI_VENDOR_ID_ASIX, PCI_DEVICE_ID_ASIX_9110, 0xa000, PCI_SUBDEVICE_ID_EMS},
|
||||
{0,}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, ems_pci_tbl);
|
||||
|
|
Loading…
Reference in a new issue