diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-06-04 18:45:11 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-06-04 18:45:11 -0700 |
| commit | 89c95b48e9ec5438d143d941ba348c99f8875416 (patch) | |
| tree | 823f2d6011328235f9f23c531a5b7fc4bfa9608c | |
| parent | 64e5ca6bfa32c6bf5bcd52c0c0ff35761a4b2465 (diff) | |
| parent | dcdf1e4632b9f99e376efc2f95af0ae4b83e04d6 (diff) | |
| download | gchips-89c95b48e9ec5438d143d941ba348c99f8875416.tar.gz | |
Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1
SBMerger: 526756187
Change-Id: Ibcffaaccaee0ee0ee93e335456839c9055b9ed4c
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | include/uapi/linux/bigo.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/uapi/linux/bigo.h b/include/uapi/linux/bigo.h index 53e743d..777fef8 100644 --- a/include/uapi/linux/bigo.h +++ b/include/uapi/linux/bigo.h @@ -9,12 +9,8 @@ #define _UAPI_BIGO_H_ #include <linux/ioctl.h> -#ifdef __KERNEL__ #include <linux/compiler.h> -#else -#define __user #include <linux/types.h> -#endif /* * Structures as parameters for BigOcean commands. It should be passed |