From 268a9b7111c4e8256341aa002b84aebe4b22e00f Mon Sep 17 00:00:00 2001
From: CMY <cmy@rock-chips.com>
Date: Tue, 11 Feb 2014 16:48:16 +0800
Subject: [PATCH] move rockchip_ion.h file to include/linux/

---
 drivers/staging/android/ion/ion.h                |  1 -
 .../staging/android/ion/rockchip/rockchip_ion.c  | 16 ++++------------
 drivers/video/rockchip/rk_fb.c                   |  2 +-
 .../uapi => include/linux}/rockchip_ion.h        |  2 ++
 4 files changed, 7 insertions(+), 14 deletions(-)
 rename {drivers/staging/android/uapi => include/linux}/rockchip_ion.h (94%)
 mode change 100755 => 100644

diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h
index dbae7ae17561..dcd2a0cdb192 100755
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -20,7 +20,6 @@
 #include <linux/types.h>
 
 #include "../uapi/ion.h"
-#include "../uapi/rockchip_ion.h"
 
 struct ion_handle;
 struct ion_device;
diff --git a/drivers/staging/android/ion/rockchip/rockchip_ion.c b/drivers/staging/android/ion/rockchip/rockchip_ion.c
index e82abcd7fc99..78bdcba76406 100755
--- a/drivers/staging/android/ion/rockchip/rockchip_ion.c
+++ b/drivers/staging/android/ion/rockchip/rockchip_ion.c
@@ -17,7 +17,7 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include "../ion.h"
+#include <linux/rockchip_ion.h>
 #include "../ion_priv.h"
 
 #ifdef CONFIG_OF
@@ -29,15 +29,7 @@
 static struct ion_device *idev;
 static int num_heaps;
 static struct ion_heap **heaps;
-/*
-static struct ion_platform_heap s_heap_data = {
-        .type = ION_HEAP_TYPE_DMA,
-        .id = 1,
-        .name = "norheap",
-        .size = 256*SZ_1M,
-        .align = SZ_1M,
-};
-*/
+
 struct ion_heap_desc {
 	unsigned int id;
 	enum ion_heap_type type;
@@ -144,12 +136,12 @@ static struct ion_platform_data *rockchip_ion_parse_dt(
 		if (ret)
 			goto free_heaps;
 
-//		msm_ion_get_heap_align(node, &pdata->heaps[idx]);
+//		rockchip_ion_get_heap_align(node, &pdata->heaps[idx]);
 		ret = rockchip_ion_get_heap_size(node, &pdata->heaps[idx]);
 		if (ret)
 			goto free_heaps;
 
-//		msm_ion_get_heap_adjacent(node, &pdata->heaps[idx]);
+//		rockchip_ion_get_heap_adjacent(node, &pdata->heaps[idx]);
                 pdata->heaps[idx].priv = dev;
                 pr_info("%d:  %d  %d  %s  0x%08X\n", idx, pdata->heaps[idx].type, pdata->heaps[idx].id, pdata->heaps[idx].name, pdata->heaps[idx].size);
 
diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 2578b9b74d2a..3a8f2cc1ab31 100755
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -44,7 +44,7 @@
 #endif
 
 #if defined(CONFIG_ION_ROCKCHIP)
-#include "../../staging/android/ion/ion.h"
+#include <linux/rockchip_ion.h>
 #endif
 
 
diff --git a/drivers/staging/android/uapi/rockchip_ion.h b/include/linux/rockchip_ion.h
old mode 100755
new mode 100644
similarity index 94%
rename from drivers/staging/android/uapi/rockchip_ion.h
rename to include/linux/rockchip_ion.h
index 4fa54d7365b8..501c3cd45633
--- a/drivers/staging/android/uapi/rockchip_ion.h
+++ b/include/linux/rockchip_ion.h
@@ -16,6 +16,8 @@
 #ifndef _LINUX_ROCKCHIP_ION_H
 #define _LINUX_ROCKCHIP_ION_H
 
+#include "../../drivers/staging/android/ion/ion.h"
+
 enum ion_heap_ids {
 	INVALID_HEAP_ID = -1,
 	ION_VIDEO_HEAP_ID = 1,
-- 
2.34.1