diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-07-23 16:04:37 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-07-23 16:04:37 +0200 |
| commit | cbb24a25a871cbdac4e58b68b541aadd91b249be (patch) | |
| tree | 0b8207913c437d91c938a64a48c1a1751a31a37b /include/linux/intel-iommu.h | |
| parent | aa4d066a2a8041b7e73cee68ce5499aca29f265e (diff) | |
| parent | e09f8ea560490e941139d23b4c278d3e6e2c871a (diff) | |
Merge branch 'core' into x86/vt-d
Conflicts:
drivers/iommu/intel-iommu.c
Diffstat (limited to 'include/linux/intel-iommu.h')
| -rw-r--r-- | include/linux/intel-iommu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 0a2da5188217..a65208a8fe18 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -336,6 +336,7 @@ struct intel_iommu { #ifdef CONFIG_IRQ_REMAP struct ir_table *ir_table; /* Interrupt remapping info */ #endif + struct device *iommu_dev; /* IOMMU-sysfs device */ int node; }; @@ -365,4 +366,6 @@ extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu); extern int dmar_ir_support(void); +extern const struct attribute_group *intel_iommu_groups[]; + #endif |