---

yaml --- r: 316578 b: refs/heads/master c: 74416e1 h: refs/heads/master v: v3
git-mirror · Jun 25, 2012 · adafd26 · adafd26
1 parent f3909c7
commit adafd26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ebb9566007083c6fd92674996d2a0be2ea79745
+refs/heads/master: 74416e1e07660798379ce10a210bf4fd35b84f9f
diff --git a/trunk/include/linux/device.h b/trunk/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;
@@ -687,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 */