summaryrefslogtreecommitdiff
path: root/include/private
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2016-07-20 18:09:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-20 18:09:35 +0000
commit173b3eff35f956ccc0050699bbebb2df95424646 (patch)
treec9015da316372b085012839248d4c4023b7a7a42 /include/private
parent0a9a1c1ba5e5b14b583cf8ca5527ce4ac8618c8d (diff)
parentb34400ea94b31d629986e0214312015fff500485 (diff)
downloadnative-173b3eff35f956ccc0050699bbebb2df95424646.tar.gz
Merge \"Change to include linux/android/binder.h.\"
am: b34400ea94 Change-Id: I1aab76bd51c448410d1d9ff3ae288013c81c8d52
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