From: Andrew Morton In file included from include/linux/pci.h:55, from arch/x86/kernel/setup_64.c:31: include/linux/pci_ids.h:2481:1: warning: "PCI_VENDOR_ID_QUATECH" redefined include/linux/pci_ids.h:1763:1: warning: this is the location of the previous definition Cc: Luís P Mendes Signed-off-by: Andrew Morton --- include/linux/pci_ids.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff -puN include/linux/pci_ids.h~parport-add-support-for-the-quatech-sppxp-100-parallel-port-pci-expresscard-fix include/linux/pci_ids.h --- a/include/linux/pci_ids.h~parport-add-support-for-the-quatech-sppxp-100-parallel-port-pci-expresscard-fix +++ a/include/linux/pci_ids.h @@ -1765,6 +1765,7 @@ #define PCI_DEVICE_ID_QUATECH_DSC100 0x0020 #define PCI_DEVICE_ID_QUATECH_ESC100D 0x0050 #define PCI_DEVICE_ID_QUATECH_ESC100M 0x0060 +#define PCI_DEVICE_ID_QUATECH_SPPXP_100 0x0278 #define PCI_VENDOR_ID_SEALEVEL 0x135e #define PCI_DEVICE_ID_SEALEVEL_U530 0x7101 @@ -2477,6 +2478,3 @@ #define PCI_DEVICE_ID_RME_DIGI32 0x9896 #define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897 #define PCI_DEVICE_ID_RME_DIGI32_8 0x9898 - -#define PCI_VENDOR_ID_QUATECH 0x135c -#define PCI_DEVICE_ID_QUATECH_SPPXP_100 0x0278 _