From: Alan Cox Updated diff which doesn't move the comment as per Jeff's request and corrects the docs as per report on l/k Signed-off-by: Alan Cox Signed-off-by: Andrew Morton --- include/linux/libata.h | 4 ---- include/linux/pci.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff -puN include/linux/libata.h~pci-move-pci_vdevice-from-libata-to-core include/linux/libata.h --- a/include/linux/libata.h~pci-move-pci_vdevice-from-libata-to-core +++ a/include/linux/libata.h @@ -110,10 +110,6 @@ static inline u32 ata_msg_init(int dval, #define ATA_TAG_POISON 0xfafbfcfdU /* move to PCI layer? */ -#define PCI_VDEVICE(vendor, device) \ - PCI_VENDOR_ID_##vendor, (device), \ - PCI_ANY_ID, PCI_ANY_ID, 0, 0 - static inline struct device *pci_dev_to_dev(struct pci_dev *pdev) { return &pdev->dev; diff -puN include/linux/pci.h~pci-move-pci_vdevice-from-libata-to-core include/linux/pci.h --- a/include/linux/pci.h~pci-move-pci_vdevice-from-libata-to-core +++ a/include/linux/pci.h @@ -395,6 +395,21 @@ struct pci_driver { */ #define pci_module_init pci_register_driver +/** + * PCI_VDEVICE - macro used to describe a specific pci device in short form + * @vendor: the vendor name + * @device: the 16 bit PCI Device ID + * + * This macro is used to create a struct pci_device_id that matches a + * specific PCI device. The subvendor, and subdevice fields will be set + * to PCI_ANY_ID. The macro allows the next field to follow as the device + * private data. + */ + +#define PCI_VDEVICE(vendor, device) \ + PCI_VENDOR_ID_##vendor, (device), \ + PCI_ANY_ID, PCI_ANY_ID, 0, 0 + /* these external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI _