From 5ea449545d360e028207a5bf3932c16c81fd450e Mon Sep 17 00:00:00 2001
From: Haynes Mathew George <hgeorge@codeaurora.org>
Date: Tue, 17 Jul 2012 15:30:05 -0700
Subject: [PATCH] mm-video : Switch back to ion.h from kernel sources.

- Also, use kernel header files exported from kernel sources
  for vdec and venc.

Change-Id: I18597074094dd6d5c1dbeed7987e307a73246552

Conflicts:

	mm-video/vidc/venc/Android.mk
---
 mm-video/vidc/vdec/inc/omx_vdec.h                       | 2 +-
 mm-video/vidc/venc/inc/omx_video_common.h               | 2 +-
 mm-video/vidc/venc/src/video_encoder_device.cpp         | 2 +-
 mm-video/vidc/venc/src/video_encoder_device_msm8974.cpp | 2 +-
 mm-video/vidc/venc/test/venc_test.cpp                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm-video/vidc/vdec/inc/omx_vdec.h b/mm-video/vidc/vdec/inc/omx_vdec.h
index 76cb0b4..d8c68fa 100755
--- a/mm-video/vidc/vdec/inc/omx_vdec.h
+++ b/mm-video/vidc/vdec/inc/omx_vdec.h
@@ -58,7 +58,7 @@ static ptrdiff_t x;
 #endif
 
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 //#include <linux/ion.h> //TBD - uncomment this
 //#include <binder/MemoryHeapIon.h>
 //#else
diff --git a/mm-video/vidc/venc/inc/omx_video_common.h b/mm-video/vidc/venc/inc/omx_video_common.h
index b57a9fa..92ba24b 100755
--- a/mm-video/vidc/venc/inc/omx_video_common.h
+++ b/mm-video/vidc/venc/inc/omx_video_common.h
@@ -35,7 +35,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include<stdlib.h>
 #include <stdio.h>
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 #endif
 
 #define OMX_VIDEO_DEC_NUM_INPUT_BUFFERS   2
diff --git a/mm-video/vidc/venc/src/video_encoder_device.cpp b/mm-video/vidc/venc/src/video_encoder_device.cpp
index 6e9b63c..db1d7f9 100755
--- a/mm-video/vidc/venc/src/video_encoder_device.cpp
+++ b/mm-video/vidc/venc/src/video_encoder_device.cpp
@@ -34,7 +34,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "omx_video_encoder.h"
 #include <linux/android_pmem.h>
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 #endif
 
 #define MPEG4_SP_START 0
diff --git a/mm-video/vidc/venc/src/video_encoder_device_msm8974.cpp b/mm-video/vidc/venc/src/video_encoder_device_msm8974.cpp
index 110a919..4f4066e 100755
--- a/mm-video/vidc/venc/src/video_encoder_device_msm8974.cpp
+++ b/mm-video/vidc/venc/src/video_encoder_device_msm8974.cpp
@@ -34,7 +34,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "omx_video_encoder.h"
 #include <linux/android_pmem.h>
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 #endif
 
 #define MPEG4_SP_START 0
diff --git a/mm-video/vidc/venc/test/venc_test.cpp b/mm-video/vidc/venc/test/venc_test.cpp
index c525aab..daa8338 100755
--- a/mm-video/vidc/venc/test/venc_test.cpp
+++ b/mm-video/vidc/venc/test/venc_test.cpp
@@ -68,7 +68,7 @@ REFERENCES
 #include "venc_util.h"
 #include "extra_data_handler.h"
 #ifdef USE_ION
-#include <ion_msm.h>
+#include <linux/ion.h>
 #endif
 
 //////////////////////////