am dd2ac3de: am d966eebf: Merge "Fix build."

* commit 'dd2ac3de625e6c0328a0f70530d8ade0d2151bfc': Fix build.
2013-11-21 22:18:38 -08:00 · 2013-11-21 22:18:38 -08:00 · bbdfc0c412
parent 330b1afc13 dd2ac3de62
commit bbdfc0c412
2 changed files with 2 additions and 1 deletions
--- a/include/ion/ion.h
+++ b/include/ion/ion.h
@ -25,6 +25,8 @@

 __BEGIN_DECLS

+struct ion_handle;
+
 int ion_open();
 int ion_close(int fd);
 int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask,
--- a/libion/ion_test.c
+++ b/libion/ion_test.c
@ -13,7 +13,6 @@

 #include <ion/ion.h>
 #include <linux/ion.h>
-#include <linux/omap_ion.h>

 size_t len = 1024*1024, align = 0;
 int prot = PROT_READ | PROT_WRITE;