From: xxm <xxm@rock-chips.com>
Date: Thu, 31 Jul 2014 08:16:47 +0000 (+0800)
Subject: rockchip:iommu:fix build error when iommu disabled
X-Git-Tag: firefly_0821_release~4945
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7f0ffc5dbc3370d1a0c468a08c1916f3a9ef5e1e;p=firefly-linux-kernel-4.4.55.git

rockchip:iommu:fix build error when iommu disabled
---

diff --git a/include/linux/rockchip/iovmm.h b/include/linux/rockchip/iovmm.h
index 6a6bde4d25eb..bd11193abddc 100755
--- 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 93f41c6ee99d..41e06dfef406 100755
--- 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;