From: CMY <cmy@rock-chips.com>
Date: Wed, 30 Apr 2014 01:46:29 +0000 (+0800)
Subject: rk: ion: fixed build bug
X-Git-Tag: firefly_0821_release~5402
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=174296e7341517d8af69c5f42bc960ebccb396ea;p=firefly-linux-kernel-4.4.55.git

rk: ion: fixed build bug
---

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 162156644146..d1f04ce8d04c 100755
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -116,8 +116,13 @@ struct ion_handle {
 	int id;
 };
 
+#ifdef CONFIG_ROCKCHIP_IOMMU
+static void ion_iommu_force_unmap(struct ion_buffer *buffer);
+#endif
+#ifdef CONFIG_ION_ROCKCHIP_SNAPSHOT
 extern char *rockchip_ion_snapshot_get(unsigned *size);
 extern int rockchip_ion_snapshot_debugfs(struct dentry* root);
+#endif
 
 bool ion_buffer_fault_user_mappings(struct ion_buffer *buffer)
 {
@@ -280,7 +285,6 @@ void ion_buffer_destroy(struct ion_buffer *buffer)
 		buffer->heap->ops->unmap_kernel(buffer->heap, buffer);
 	buffer->heap->ops->unmap_dma(buffer->heap, buffer);
 #ifdef CONFIG_ROCKCHIP_IOMMU
-	static void ion_iommu_force_unmap(struct ion_buffer *buffer);
 	ion_iommu_force_unmap(buffer);
 #endif
 	buffer->heap->ops->free(buffer);