From: Andrew Morton Fix fallout from git-libata-all git merge Signed-off-by: Andrew Morton --- include/linux/pci.h | 18 ------------------ 1 file changed, 18 deletions(-) diff -puN include/linux/pci.h~git-libata-all-fixup include/linux/pci.h --- a/include/linux/pci.h~git-libata-all-fixup +++ a/include/linux/pci.h @@ -394,7 +394,6 @@ struct pci_driver { */ #define pci_module_init pci_register_driver -<<<<<<< HEAD/include/linux/pci.h /** * PCI_VDEVICE - macro used to describe a specific pci device in short form * @vend: the vendor name @@ -410,23 +409,6 @@ struct pci_driver { PCI_VENDOR_ID_##vendor, (device), \ PCI_ANY_ID, PCI_ANY_ID, 0, 0 -======= -/** - * 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 - ->>>>>>> /include/linux/pci.h /* these external functions are only available when PCI support is enabled */ #ifdef CONFIG_PCI _