Remove linux/android_pmem.h include.
This file is not needed any more, and does not exist in uapi kernel headers.
Change-Id: I930e2bbf98a89ac3e0162bb2df039d1f286ddd76
diff --git a/camera/QCamera/HAL/core/inc/QCameraHWI.h b/camera/QCamera/HAL/core/inc/QCameraHWI.h
index a666383..86cfb0f 100644
--- a/camera/QCamera/HAL/core/inc/QCameraHWI.h
+++ b/camera/QCamera/HAL/core/inc/QCameraHWI.h
@@ -35,7 +35,6 @@
#include <QComOMXMetadata.h>
extern "C" {
-#include <linux/android_pmem.h>
#include <linux/ion.h>
#include <mm_camera_interface2.h>
diff --git a/camera/QCamera/HAL/core/inc/QCameraHWI_Mem.h b/camera/QCamera/HAL/core/inc/QCameraHWI_Mem.h
index c1484e1..8cc307a 100644
--- a/camera/QCamera/HAL/core/inc/QCameraHWI_Mem.h
+++ b/camera/QCamera/HAL/core/inc/QCameraHWI_Mem.h
@@ -24,7 +24,6 @@
#include <stdint.h>
extern "C" {
-#include <linux/android_pmem.h>
#include <linux/ion.h>
#include <camera_defs_i.h>
diff --git a/camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp b/camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp
index 0cb1100..4509fc6 100644
--- a/camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp
+++ b/camera/QCamera/HAL/core/src/QCameraHWI_Mem.cpp
@@ -31,9 +31,6 @@
#include <fcntl.h>
#include <cutils/properties.h>
#include <math.h>
-#if HAVE_ANDROID_OS
-#include <linux/android_pmem.h>
-#endif
#include <linux/ioctl.h>
#include <camera/CameraParameters.h>
#include <media/mediarecorder.h>
diff --git a/camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp b/camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp
index b4381c1..17dcd28 100644
--- a/camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp
+++ b/camera/QCamera/HAL/core/src/QCameraHWI_Parm.cpp
@@ -29,9 +29,6 @@
#include <fcntl.h>
#include <cutils/properties.h>
#include <math.h>
-#if HAVE_ANDROID_OS
-#include <linux/android_pmem.h>
-#endif
#include <linux/ioctl.h>
#include <camera/CameraParameters.h>
#include <media/mediarecorder.h>
diff --git a/camera/QCamera/stack/mm-camera-test/src/mm_qcamera_display.c b/camera/QCamera/stack/mm-camera-test/src/mm_qcamera_display.c
index 3640f96..b831661 100644
--- a/camera/QCamera/stack/mm-camera-test/src/mm_qcamera_display.c
+++ b/camera/QCamera/stack/mm-camera-test/src/mm_qcamera_display.c
@@ -36,7 +36,6 @@
#include <sys/ioctl.h>
struct file;
struct inode;
-#include <linux/android_pmem.h>
#include <sys/mman.h>
#include <errno.h>
#include <sys/time.h>
diff --git a/camera/QCameraHWI.h b/camera/QCameraHWI.h
index c9a7f3e..813f6cd 100644
--- a/camera/QCameraHWI.h
+++ b/camera/QCameraHWI.h
@@ -35,7 +35,6 @@
#include <QComOMXMetadata.h>
extern "C" {
-#include <linux/android_pmem.h>
#include <linux/msm_ion.h>
#include <mm_camera_interface2.h>
#include "mm_omx_jpeg_encoder.h"
diff --git a/camera/QCameraHWI_Mem.cpp b/camera/QCameraHWI_Mem.cpp
index e8e469b..552569d 100644
--- a/camera/QCameraHWI_Mem.cpp
+++ b/camera/QCameraHWI_Mem.cpp
@@ -31,9 +31,6 @@
#include <fcntl.h>
#include <cutils/properties.h>
#include <math.h>
-#if HAVE_ANDROID_OS
-#include <linux/android_pmem.h>
-#endif
#include <linux/ioctl.h>
#include "QCameraParameters.h"
#include <media/mediarecorder.h>
diff --git a/camera/QCameraHWI_Mem.h b/camera/QCameraHWI_Mem.h
index b2f4691..0e9fbbf 100644
--- a/camera/QCameraHWI_Mem.h
+++ b/camera/QCameraHWI_Mem.h
@@ -25,7 +25,6 @@
#include "QCamera_Intf.h"
extern "C" {
-#include <linux/android_pmem.h>
#include <linux/msm_ion.h>
}
@@ -86,7 +85,6 @@
int myOffset;
int mCameraControlFd;
uint32_t mAlignedSize;
- struct pmem_region mSize;
};
class IonPool : public MemPool {
diff --git a/camera/QCameraHWI_Parm.cpp b/camera/QCameraHWI_Parm.cpp
index 19dfc50..3375df7 100644
--- a/camera/QCameraHWI_Parm.cpp
+++ b/camera/QCameraHWI_Parm.cpp
@@ -29,9 +29,6 @@
#include <fcntl.h>
#include <cutils/properties.h>
#include <math.h>
-#if HAVE_ANDROID_OS
-#include <linux/android_pmem.h>
-#endif
#include <linux/ioctl.h>
#include "QCameraParameters.h"
#include <media/mediarecorder.h>
diff --git a/camera/QualcommCameraHardware.cpp b/camera/QualcommCameraHardware.cpp
index 915ded3..d6f6cee 100644
--- a/camera/QualcommCameraHardware.cpp
+++ b/camera/QualcommCameraHardware.cpp
@@ -38,9 +38,6 @@
#include <fcntl.h>
#include <cutils/properties.h>
#include <math.h>
-#if HAVE_ANDROID_OS
-#include <linux/android_pmem.h>
-#endif
#include <linux/ioctl.h>
#include "QCameraParameters.h"
#include <media/mediarecorder.h>
diff --git a/camera/QualcommCameraHardware.h b/camera/QualcommCameraHardware.h
index 61fd0c8..321514c 100644
--- a/camera/QualcommCameraHardware.h
+++ b/camera/QualcommCameraHardware.h
@@ -39,7 +39,6 @@
#include "QCamera_Intf.h"
extern "C" {
-#include <linux/android_pmem.h>
#include <linux/ion.h>
#include <mm_camera_interface.h>
}
