diff --git a/[refs] b/[refs] index 836af334bcb4..5751973869a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f20b16ff7c19d1c369ee07470952aca093551ed0 +refs/heads/master: d4013f07bd5380178bf28ef1cd76649779367288 diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 84f12e8cae71..dab4dc505ce7 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -109,10 +109,6 @@ static inline u32 ata_msg_init(int dval, int default_msg_enable_bits) #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;