aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-12-16 16:33:00 -0800
committerColin Cross <ccross@android.com>2013-12-16 16:33:00 -0800
commit8d9bc1404990afcc1fa73f1412f2b653fc3ecd31 (patch)
tree9b2088d6b4bdf3aac1552fb5f58c710598da28bb /drivers/staging
parentf2b94c52648fa1bb7cba053ab0f4a85e066485a1 (diff)
downloadlinaro-lsk-8d9bc1404990afcc1fa73f1412f2b653fc3ecd31.tar.gz
ion: remove ion_user_handle_t from ion_test.h
ion_test.h should not define ion_user_handle_t, and defining it causes a warning: In file included from drivers/staging/android/ion/ion_test.c:31: drivers/staging/android/ion/../uapi/ion_test.h:23: error: redefinition of typedef 'ion_user_handle_t' drivers/staging/android/ion/../uapi/ion.h:23: note: previous declaration of 'ion_user_handle_t' was here Change-Id: I541897745a5ff128790a7e51b23f3034f5d3d6d9 Reported-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/android/uapi/ion_test.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/android/uapi/ion_test.h b/drivers/staging/android/uapi/ion_test.h
index 352379a0269..614d1e36f72 100644
--- a/drivers/staging/android/uapi/ion_test.h
+++ b/drivers/staging/android/uapi/ion_test.h
@@ -20,8 +20,6 @@
#include <linux/ioctl.h>
#include <linux/types.h>
-typedef int ion_user_handle_t;
-
/**
* struct ion_test_rw_data - metadata passed to the kernel to read handle
* @ptr: a pointer to an area at least as large as size