summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2018-05-01 12:28:35 -0700
committerJohn Stultz <john.stultz@linaro.org>2018-07-11 15:59:25 -0700
commit29a9ca7da1035e2ae4a4c7f8d605f90c6395e12e (patch)
tree815aea4c7022727ed68b210b4d41a0919e575205
parent1e2c80bd71e1944c8e992684e4ac38ea45db68c5 (diff)
downloadhikey-29a9ca7da1035e2ae4a4c7f8d605f90c6395e12e.tar.gz
gralloc/gralloc960: Drop linux/ion.h references as its gone
Bionic dropped the linux/ion.h header, so make sure we don't try to include it and cause build errors. Change-Id: I6af15f1bd2b53e7d5dd29a93295bfc09df36ab62 Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--gralloc/alloc_device.cpp1
-rw-r--r--gralloc/gralloc_module.cpp1
-rw-r--r--gralloc960/gralloc_priv.h1
-rw-r--r--gralloc960/mali_gralloc_buffer.h1
-rw-r--r--gralloc960/mali_gralloc_ion.cpp1
5 files changed, 0 insertions, 5 deletions
diff --git a/gralloc/alloc_device.cpp b/gralloc/alloc_device.cpp
index 076cb5ce..fe3f14f0 100644
--- a/gralloc/alloc_device.cpp
+++ b/gralloc/alloc_device.cpp
@@ -39,7 +39,6 @@
#endif
#if GRALLOC_ARM_DMA_BUF_MODULE
-#include <linux/ion.h>
#include <ion/ion.h>
#include "ion_4.12.h"
#endif
diff --git a/gralloc/gralloc_module.cpp b/gralloc/gralloc_module.cpp
index 84054736..4937b596 100644
--- a/gralloc/gralloc_module.cpp
+++ b/gralloc/gralloc_module.cpp
@@ -37,7 +37,6 @@ static int s_ump_is_open = 0;
#endif
#if GRALLOC_ARM_DMA_BUF_MODULE
-#include <linux/ion.h>
#include <ion/ion.h>
#include <sys/mman.h>
#endif
diff --git a/gralloc960/gralloc_priv.h b/gralloc960/gralloc_priv.h
index 82538bc0..3a54c18e 100644
--- a/gralloc960/gralloc_priv.h
+++ b/gralloc960/gralloc_priv.h
@@ -23,7 +23,6 @@
#include <pthread.h>
#include <errno.h>
#include <linux/fb.h>
-#include <linux/ion.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/mman.h>
diff --git a/gralloc960/mali_gralloc_buffer.h b/gralloc960/mali_gralloc_buffer.h
index 959653f0..96880bec 100644
--- a/gralloc960/mali_gralloc_buffer.h
+++ b/gralloc960/mali_gralloc_buffer.h
@@ -21,7 +21,6 @@
#include <errno.h>
#include <sys/types.h>
#include <unistd.h>
-#include <linux/ion.h>
#include <sys/mman.h>
#include "mali_gralloc_private_interface_types.h"
diff --git a/gralloc960/mali_gralloc_ion.cpp b/gralloc960/mali_gralloc_ion.cpp
index 63d9e18f..ccc7e49d 100644
--- a/gralloc960/mali_gralloc_ion.cpp
+++ b/gralloc960/mali_gralloc_ion.cpp
@@ -25,7 +25,6 @@
#include <log/log.h>
#include <cutils/atomic.h>
-#include <linux/ion.h>
#include <ion/ion.h>
#include <sys/ioctl.h>