aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat
diff options
context:
space:
mode:
authorOmar Ramirez Luna <omar.luna@linaro.org>2012-09-23 19:28:23 -0400
committerPaul Walmsley <paul@pwsan.com>2012-09-23 19:28:23 -0400
commit7460f1407ed8d46042b81a4227f19bc03e4d1072 (patch)
treebf0fc6692aca2872769e3891599059b6a043abfc /arch/arm/plat-omap/include/plat
parent53cce97c3922fe4c08d2474e4f7b1968e79d7219 (diff)
ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected
If included without IOMMU_API being selected it will break compilation: arch/arm/plat-omap/include/plat/iommu.h: In function 'dev_to_omap_iommu': arch/arm/plat-omap/include/plat/iommu.h:148: error: 'struct dev_archdata' has no member named 'iommu' This will be seen when hwmod includes iommu.h to get the structure for attributes. Also needed for tidspbridge incremental migration to use iommu code. Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Omar Ramirez Luna <omar.luna@linaro.org> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/plat-omap/include/plat')
-rw-r--r--arch/arm/plat-omap/include/plat/iommu.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h
index 88be3e628b33..e58d57131476 100644
--- a/arch/arm/plat-omap/include/plat/iommu.h
+++ b/arch/arm/plat-omap/include/plat/iommu.h
@@ -126,6 +126,7 @@ struct omap_iommu_arch_data {
126 struct omap_iommu *iommu_dev; 126 struct omap_iommu *iommu_dev;
127}; 127};
128 128
129#ifdef CONFIG_IOMMU_API
129/** 130/**
130 * dev_to_omap_iommu() - retrieves an omap iommu object from a user device 131 * dev_to_omap_iommu() - retrieves an omap iommu object from a user device
131 * @dev: iommu client device 132 * @dev: iommu client device
@@ -136,6 +137,7 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
136 137
137 return arch_data->iommu_dev; 138 return arch_data->iommu_dev;
138} 139}
140#endif
139 141
140/* IOMMU errors */ 142/* IOMMU errors */
141#define OMAP_IOMMU_ERR_TLB_MISS (1 << 0) 143#define OMAP_IOMMU_ERR_TLB_MISS (1 << 0)