Merge branch 'linus' into irq/core

[firefly-linux-kernel-4.4.55.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index a2b4ea70a9467520d93a556190ca8995183e4af9..3d3139ad5705e6c2420193f6a4019ae242740942 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -714,6 +714,7 @@ struct device_dma_parameters {
  *             along with subsystem-level and driver-level callbacks.
  * @pins:      For device pin management.
  *             See Documentation/pinctrl.txt for details.
+ * @msi_list:  Hosts MSI descriptors
  * @numa_node: NUMA node this device is close to.
  * @dma_mask:  Dma mask (if dma'ble device).
  * @coherent_dma_mask: Like dma_mask, but for alloc_coherent mapping as not all
@@ -777,6 +778,9 @@ struct device {
 #ifdef CONFIG_PINCTRL
        struct dev_pin_info     *pins;
 #endif
+#ifdef CONFIG_GENERIC_MSI_IRQ
+       struct list_head        msi_list;
+#endif
 
 #ifdef CONFIG_NUMA
        int             numa_node;      /* NUMA node this device is close to */