Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

[pandora-kernel.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index bdcf361..85e78fc 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -33,6 +33,7 @@ struct class;
 struct subsys_private;
 struct bus_type;
 struct device_node;
 struct subsys_private;
 struct bus_type;
 struct device_node;

+struct iommu_ops;

 
 struct bus_attribute {
        struct attribute        attr;
 
 struct bus_attribute {
        struct attribute        attr;


@@ -67,6 +68,9 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
  * @resume:    Called to bring a device on this bus out of sleep mode.
  * @pm:                Power management operations of this bus, callback the specific
  *             device driver's pm-ops.
  * @resume:    Called to bring a device on this bus out of sleep mode.
  * @pm:                Power management operations of this bus, callback the specific
  *             device driver's pm-ops.

+ * @iommu_ops   IOMMU specific operations for this bus, used to attach IOMMU
+ *              driver implementations to a bus and allow the driver to do
+ *              bus-specific setup

  * @p:         The private data of the driver core, only the driver core can
  *             touch this.
  *
  * @p:         The private data of the driver core, only the driver core can
  *             touch this.
  *


@@ -96,6 +100,8 @@ struct bus_type {
 
        const struct dev_pm_ops *pm;
 
 
        const struct dev_pm_ops *pm;
 

+       struct iommu_ops *iommu_ops;
+

        struct subsys_private *p;
 };
 
        struct subsys_private *p;
 };