xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.0-rc4 into char-misc-next

Browse Source 
We need the char-misc fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2019-01-28 08:13:52 +01:00
parent f9f7bb9e0a f17b5f06cb
commit fdddcfd9c9
1169 changed files with 11838 additions and 6473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/uapi/linux/android/binder_ctl.h → include/uapi/linux/android/binderfs.h
View File

@@ -4,8 +4,8 @@
*
*/
#ifndef _UAPI_LINUX_BINDER_CTL_H
#define _UAPI_LINUX_BINDER_CTL_H
#ifndef _UAPI_LINUX_BINDERFS_H
#define _UAPI_LINUX_BINDERFS_H
#include <linux/android/binder.h>
#include <linux/types.h>
@@ -22,8 +22,8 @@
*/
struct binderfs_device {
char name[BINDERFS_MAX_NAME + 1];
__u8 major;
__u8 minor;
__u32 major;
__u32 minor;
};
/**
@@ -31,5 +31,5 @@ struct binderfs_device {
*/
#define BINDER_CTL_ADD _IOWR('b', 1, struct binderfs_device)
#endif /* _UAPI_LINUX_BINDER_CTL_H */
#endif /* _UAPI_LINUX_BINDERFS_H */