summaryrefslogtreecommitdiff
path: root/include/private
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2016-07-20 18:26:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-20 18:26:58 +0000
commitbe3aaf573db1d087f2fb0aa4b496c290c5820eae (patch)
treedf013daf6448563a79d688cc96a4ce21e42ea361 /include/private
parent1ad6b8d037ed277baedecad01f6490f1dbf130c8 (diff)
parent672322d5cf3275327dab49ddf46184fb6b6e71b8 (diff)
downloadnative-be3aaf573db1d087f2fb0aa4b496c290c5820eae.tar.gz
Merge \\\"Change to include linux/android/binder.h.\\\" am: b34400ea94 am: 173b3eff35
am: 672322d5cf Change-Id: I51ab527287464759590b3e1f21c4d3692ef364e6
Diffstat (limited to 'include/private')
-rw-r--r--include/private/binder/binder_module.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/private/binder/binder_module.h b/include/private/binder/binder_module.h
index a8dd64f235..2f11622e70 100644
--- a/include/private/binder/binder_module.h
+++ b/include/private/binder/binder_module.h
@@ -24,7 +24,7 @@ namespace android {
/* obtain structures and constants from the kernel header */
#include <sys/ioctl.h>
-#include <linux/binder.h>
+#include <linux/android/binder.h>
#ifdef __cplusplus
} // namespace android