Merge remote-tracking branches 'asoc/fix/blackfin', 'asoc/fix/da9055', 'asoc/fix...

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

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 709a697c4e02b5f83abd3ddad515308506fcd52f..b96a5b2136e46be7fbeec8235c10a918df737ae9 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -248,6 +248,11 @@ static inline struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
        return NULL;
 }
 
+static inline struct iommu_group *iommu_group_get_by_id(int id)
+{
+       return NULL;
+}
+
 static inline void iommu_domain_free(struct iommu_domain *domain)
 {
 }
@@ -292,8 +297,8 @@ static inline phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_ad
        return 0;
 }
 
-static inline int domain_has_cap(struct iommu_domain *domain,
-                                unsigned long cap)
+static inline int iommu_domain_has_cap(struct iommu_domain *domain,
+                                      unsigned long cap)
 {
        return 0;
 }