The patch titled pci: get rid of pci_dev::{vendor,device}_compatible fields has been added to the -mm tree. Its filename is pci-get-rid-of-pci_devvendordevice_compatible-fields.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: pci: get rid of pci_dev::{vendor,device}_compatible fields From: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx> The vendor_compatible and device_compatible fields in struct pci_dev aren't used anywhere, and are somewhat pointless. Assuming that these are historical artifacts, remove them. Signed-off-by: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/pci.h | 5 ----- 1 file changed, 5 deletions(-) diff -puN include/linux/pci.h~pci-get-rid-of-pci_devvendordevice_compatible-fields include/linux/pci.h --- a/include/linux/pci.h~pci-get-rid-of-pci_devvendordevice_compatible-fields +++ a/include/linux/pci.h @@ -66,7 +66,6 @@ enum pci_mmap_state { #define PCI_DMA_FROMDEVICE 2 #define PCI_DMA_NONE 3 -#define DEVICE_COUNT_COMPATIBLE 4 #define DEVICE_COUNT_RESOURCE 12 typedef int __bitwise pci_power_t; @@ -167,10 +166,6 @@ struct pci_dev { pci_channel_state_t error_state; /* current connectivity state */ struct device dev; /* Generic device interface */ - /* device is compatible with these IDs */ - unsigned short vendor_compatible[DEVICE_COUNT_COMPATIBLE]; - unsigned short device_compatible[DEVICE_COUNT_COMPATIBLE]; - int cfg_size; /* Size of configuration space */ /* _ Patches currently in -mm which might be from buytenh@xxxxxxxxxxxxxx are git-arm.patch git-hwmon.patch pci-get-rid-of-pci_devvendordevice_compatible-fields.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html