diff options
| author | Cyan_Hsieh <cyanhsieh@google.com> | 2019-11-18 14:25:32 +0800 |
|---|---|---|
| committer | Cyan_Hsieh <cyanhsieh@google.com> | 2019-11-18 14:25:58 +0800 |
| commit | a3a64e2d2530000179d64d07ba2c2172633d7627 (patch) | |
| tree | a385509b5645a403639e9f12aae867e0a9029fa3 /sm7150 | |
| parent | df8d3fdf9786df8cdb3b6919f20a41bae08a9bfd (diff) | |
| download | sunfish-kernel-a3a64e2d2530000179d64d07ba2c2172633d7627.tar.gz | |
sunfish: update kernel-and-modules prebuilt
Linux version 4.14.117-ga7d3bb92da76-ab6014595 (android-
build@wprn4.hot.corp.google.com) (Android (5484270 based on
r353983c) clang version 9.0.3
(https://android.googlesource.com/toolchain/clang
745b335211bb9eadfa6aa6301f84715cee4b37c5)
(https://android.googlesource.com/toolchain/llvm
60cf23e54e46c807513f7a36d0a7b777920b5881) (based on LLVM
9.0.3svn)) #1 SMP PREEMPT Mon Nov 18 05:50:51 UTC 2019
build:
dce0d880 Merge "abi: update libabigail to latest upstream mm-next"
8d93be1f build.sh: support boot header version 3
a80e4d2b build.sh: provide default MKBOOTIMG_PATH
431d71be abi: update libabigail to latest upstream mm-next
kernel/private/tests/patchwork:
fe406921 Makefile: add new shortcut for code coverage
private/msm-google:
a7d3bb92 Merge branch 'LA.UM.8.9.R1.10.00.00.558.053' via branch 'qcom-msm-4.14-7150' into android-msm-sunfish-4.14
8967f513 arm64: dts: Correct the voltage of PM7150A L6C
private/msm-google-modules/data-kernel:
fce2ca19 Merge branch 'LA.UM.8.9.R1.10.00.00.558.053' via branch 'qcom-msm-4.14-7150' into android-msm-sunfish-4.14
c0613f0d Merge branch 'LA.UM.8.9.R1.10.00.00.558.053' into qcom-msm-4.14-7150
private/msm-google/techpack/audio:
47681d21 Merge branch 'LA.UM.8.9.R1.10.00.00.558.053' via branch 'qcom-msm-4.14-7150' into android-msm-sunfish-4.14
Bug: 141966345
Bug: 144079922
Bug: 144271912
Bug: 144621133
Change-Id: Ie4d2bd5e1d73cad2aa2dc59c0251bb8db230cf6a
Pick-Prebuilt: 278012881
Build-Id: 6014595
Processing-Config: kernel_headers
Signed-off-by: Cyan_Hsieh <cyanhsieh@google.com>
Diffstat (limited to 'sm7150')
| -rw-r--r-- | sm7150/kernel-headers/linux/v4l2-controls.h | 4 | ||||
| -rw-r--r-- | sm7150/original-kernel-headers/linux/v4l2-controls.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sm7150/kernel-headers/linux/v4l2-controls.h b/sm7150/kernel-headers/linux/v4l2-controls.h index c4c721cb0..8461b366a 100644 --- a/sm7150/kernel-headers/linux/v4l2-controls.h +++ b/sm7150/kernel-headers/linux/v4l2-controls.h @@ -785,8 +785,8 @@ enum v4l2_mpeg_vidc_video_tme_level { #define V4L2_CID_MPEG_VIDC_VIDEO_FLIP (V4L2_CID_MPEG_MSM_VIDC_BASE + 115) enum v4l2_mpeg_vidc_video_flip { V4L2_CID_MPEG_VIDC_VIDEO_FLIP_NONE = 0, - V4L2_CID_MPEG_VIDC_VIDEO_FLIP_HORI = 1, - V4L2_CID_MPEG_VIDC_VIDEO_FLIP_VERT = 2, + V4L2_CID_MPEG_VIDC_VIDEO_FLIP_VERT = 1, + V4L2_CID_MPEG_VIDC_VIDEO_FLIP_HORI = 2, V4L2_CID_MPEG_VIDC_VIDEO_FLIP_BOTH = 3, }; #define V4L2_CID_MPEG_VIDC_VENC_HDR_INFO (V4L2_CID_MPEG_MSM_VIDC_BASE + 116) diff --git a/sm7150/original-kernel-headers/linux/v4l2-controls.h b/sm7150/original-kernel-headers/linux/v4l2-controls.h index 5af6fb880..4fa3fcadd 100644 --- a/sm7150/original-kernel-headers/linux/v4l2-controls.h +++ b/sm7150/original-kernel-headers/linux/v4l2-controls.h @@ -1028,8 +1028,8 @@ enum v4l2_mpeg_vidc_video_tme_level { #define V4L2_CID_MPEG_VIDC_VIDEO_FLIP (V4L2_CID_MPEG_MSM_VIDC_BASE + 115) enum v4l2_mpeg_vidc_video_flip { V4L2_CID_MPEG_VIDC_VIDEO_FLIP_NONE = 0, - V4L2_CID_MPEG_VIDC_VIDEO_FLIP_HORI = 1, - V4L2_CID_MPEG_VIDC_VIDEO_FLIP_VERT = 2, + V4L2_CID_MPEG_VIDC_VIDEO_FLIP_VERT = 1, + V4L2_CID_MPEG_VIDC_VIDEO_FLIP_HORI = 2, V4L2_CID_MPEG_VIDC_VIDEO_FLIP_BOTH = 3, }; |