rockchip:iommu:fix build error when iommu disabled

diff --git a/include/linux/rockchip/iovmm.h b/include/linux/rockchip/iovmm.h
index 6a6bde4d25eb181d057e79b48740f262b2db8955..bd11193abddce3583b4ef900cb52a0d34e4e47d1 100755 (executable)
--- a/include/linux/rockchip/iovmm.h
+++ b/include/linux/rockchip/iovmm.h
@@ -7,9 +7,9 @@
 #ifndef __ASM_PLAT_IOVMM_H
 #define __ASM_PLAT_IOVMM_H
 
-#ifdef CONFIG_ROCKCHIP_IOVMM
 struct scatterlist;
 struct device;
+#ifdef CONFIG_ROCKCHIP_IOVMM
 
 int iovmm_activate(struct device *dev);
 void iovmm_deactivate(struct device *dev);

diff --git a/include/linux/rockchip/sysmmu.h b/include/linux/rockchip/sysmmu.h
index 93f41c6ee99d855c588a38230df872a70d9343d3..41e06dfef4062141610c9cfd34a299bb7ae336ec 100755 (executable)
--- a/include/linux/rockchip/sysmmu.h
+++ b/include/linux/rockchip/sysmmu.h
@@ -12,6 +12,7 @@
 #include <linux/list.h>
 #include <linux/atomic.h>
 #include <linux/spinlock.h>
+#include <linux/device.h>
 
 #define IEP_SYSMMU_COMPATIBLE_NAME "iommu,iep_mmu"
 #define VIP_SYSMMU_COMPATIBLE_NAME "iommu,vip_mmu"
@@ -126,7 +127,6 @@ static inline void rockchip_sysmmu_set_prefbuf(struct device *owner,
 #endif
 
 #ifdef CONFIG_IOMMU_API
-#include <linux/device.h>
 static inline void platform_set_sysmmu(struct device *sysmmu, struct device *dev)
 {
        dev->archdata.iommu = sysmmu;