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

* commit 'bbdfc0c4124d838d16b65ef96cf4285dbe8ae038':
  Fix build.
diff --git a/include/ion/ion.h b/include/ion/ion.h
index 47a4030..0451b5a 100644
--- 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,
diff --git a/libion/ion_test.c b/libion/ion_test.c
index 5d8d684..ae0510c 100644
--- 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;