diff options
| author | Christopher Ferris <cferris@google.com> | 2016-07-20 18:33:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-20 18:33:29 +0000 |
| commit | cb3d20d06ddd8b8bd28db4c3a9dc9b93212b4a08 (patch) | |
| tree | 80ced3df02b04623f26401f8ff02cd8b7b1e7a40 /include/private | |
| parent | 7aa21c980ffb37eac6ca7f0e3741893f86600269 (diff) | |
| parent | be3aaf573db1d087f2fb0aa4b496c290c5820eae (diff) | |
| download | native-cb3d20d06ddd8b8bd28db4c3a9dc9b93212b4a08.tar.gz | |
Merge \\\\"Change to include linux/android/binder.h.\\\\" am: b34400ea94 am: 173b3eff35 am: 672322d5cf
am: be3aaf573d
Change-Id: I9561eb03ae0c3da693cb39cf28127fc73aeb57b7
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/binder/binder_module.h | 2 |
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 |