Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr...

[~andy/linux] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index e04f5776f6d0ef3ee0b4554638adbb9e67be026c..5083bccae9676779ba4368d84d2672d37e6222ef 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -36,6 +36,7 @@ struct subsys_private;
 struct bus_type;
 struct device_node;
 struct iommu_ops;
+struct iommu_group;
 
 struct bus_attribute {
        struct attribute        attr;
@@ -667,6 +668,10 @@ struct device {
 
        struct dma_coherent_mem *dma_mem; /* internal for coherent mem
                                             override */
+#ifdef CONFIG_CMA
+       struct cma *cma_area;           /* contiguous memory area for dma
+                                          allocations */
+#endif
        /* arch specific additions */
        struct dev_archdata     archdata;
 
@@ -683,6 +688,7 @@ struct device {
        const struct attribute_group **groups;  /* optional groups */
 
        void    (*release)(struct device *dev);
+       struct iommu_group      *iommu_group;
 };
 
 /* Get the wakeup routines, which depend on struct device */
@@ -861,8 +867,6 @@ extern int (*platform_notify_remove)(struct device *dev);
 extern struct device *get_device(struct device *dev);
 extern void put_device(struct device *dev);
 
-extern void wait_for_device_probe(void);
-
 #ifdef CONFIG_DEVTMPFS
 extern int devtmpfs_create_node(struct device *dev);
 extern int devtmpfs_delete_node(struct device *dev);