Merge branch 'spi-4.20' into spi-next

2018-10-21 17:00:14 +01:00
parent 92d58fd13a 0c903aafc8
commit 4b51c747e4
53 changed files with 3941 additions and 396 deletions
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1705,6 +1705,10 @@ static inline int pci_irqd_intx_xlate(struct irq_domain *d,
 				      unsigned long *out_hwirq,
 				      unsigned int *out_type)
 { return -EINVAL; }
+
+static inline const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
+							 struct pci_dev *dev)
+{ return NULL; }
 #endif /* CONFIG_PCI */

 /* Include architecture-dependent settings and functions */