aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Anna2019-03-12 19:59:40 -0500
committerSuman Anna2019-03-12 20:00:14 -0500
commit3f7a6ae7d5d9724cfbe480bb8a12009aa4e5061c (patch)
tree3ffbcb473cd682a219d2614aafdc560411f48c3d
parent05767f3235201f66f83e3e0f2edc25ea9afed658 (diff)
parenta5585f02e9bd068ee7fb8b460e45b0b98684d60a (diff)
downloadremoteproc-3f7a6ae7d5d9724cfbe480bb8a12009aa4e5061c.tar.gz
remoteproc-3f7a6ae7d5d9724cfbe480bb8a12009aa4e5061c.tar.xz
remoteproc-3f7a6ae7d5d9724cfbe480bb8a12009aa4e5061c.zip
Merge branch 'iommu-linux-4.19.y' of git://git.ti.com/rpmsg/iommu into rproc-linux-4.19.y
Merge in the updated iommu feature branch into remoteproc tree to pull in a minor build fix seen when CONFIG_OMAP_IOMMU is not defined and used with COMPILE_TEST. * 'iommu-linux-4.19.y' of git://git.ti.com/rpmsg/iommu: iommu/omap: Fix a typo in the public omap-iommu.h file Signed-off-by: Suman Anna <s-anna@ti.com>
-rw-r--r--include/linux/omap-iommu.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/omap-iommu.h b/include/linux/omap-iommu.h
index 5b66325bc63c..d9eb8ccf93a6 100644
--- a/include/linux/omap-iommu.h
+++ b/include/linux/omap-iommu.h
@@ -13,6 +13,8 @@
13#ifndef _OMAP_IOMMU_H_ 13#ifndef _OMAP_IOMMU_H_
14#define _OMAP_IOMMU_H_ 14#define _OMAP_IOMMU_H_
15 15
16#include <linux/errno.h>
17
16struct iommu_domain; 18struct iommu_domain;
17 19
18#ifdef CONFIG_OMAP_IOMMU 20#ifdef CONFIG_OMAP_IOMMU
@@ -27,12 +29,12 @@ static inline void omap_iommu_restore_ctx(struct device *dev) {}
27 29
28static inline int omap_iommu_domain_deactivate(struct iommu_domain *domain) 30static inline int omap_iommu_domain_deactivate(struct iommu_domain *domain)
29{ 31{
30 return -ENOTSUP; 32 return -ENOTSUPP;
31} 33}
32 34
33static inline int omap_iommu_domain_activate(struct iommu_domain *domain) 35static inline int omap_iommu_domain_activate(struct iommu_domain *domain)
34{ 36{
35 return -ENOTSUP; 37 return -ENOTSUPP;
36} 38}
37#endif 39#endif
38 40