commit 0170cd016c8c649da3a3d845276e6c5ffa350481
author Christopher Ferris <cferris@google.com> Mon Jul 18 16:57:34 2016 -0700
committer Christopher Ferris <cferris@google.com> Mon Jul 18 17:01:04 2016 -0700
tree da5651a3b828e9f7c3b4f3203047998b72fcdd8a
parent 7d8f246415075326557b0ebbf95050b715fd4002

Change to include linux/android/binder.h.

The upstream kernels have binder.h as linux/android/binder.h, so
match that.

Bug: 30072483
Change-Id: Iacdc96629dd09c1f4be0a5767666ab64b3df8f15

cmds/servicemanager/binder.h

diff --git a/cmds/servicemanager/binder.h b/cmds/servicemanager/binder.h
index 7915fc2..881ab07 100644
--- a/cmds/servicemanager/binder.h
+++ b/cmds/servicemanager/binder.h
@@ -5,7 +5,7 @@
 #define _BINDER_H_
 
 #include <sys/ioctl.h>
-#include <linux/binder.h>
+#include <linux/android/binder.h>
 
 struct binder_state;
 

include/binder/Parcel.h

diff --git a/include/binder/Parcel.h b/include/binder/Parcel.h
index 97a3376..1509165 100644
--- a/include/binder/Parcel.h
+++ b/include/binder/Parcel.h
@@ -27,7 +27,7 @@
 #include <utils/String16.h>
 #include <utils/Vector.h>
 #include <utils/Flattenable.h>
-#include <linux/binder.h>
+#include <linux/android/binder.h>
 
 #include <binder/IInterface.h>
 #include <binder/Parcelable.h>

include/private/binder/binder_module.h

diff --git a/include/private/binder/binder_module.h b/include/private/binder/binder_module.h
index a8dd64f..2f11622 100644
--- a/include/private/binder/binder_module.h
+++ b/include/private/binder/binder_module.h
@@ -24,7 +24,7 @@
 /* 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