diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-15 17:01:18 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-15 17:01:18 -0800 |
| commit | c5a29451a3f0c8c78e4a33bfddfb9c46af7c368d (patch) | |
| tree | 0598ed7d26d948a59589460cdcd81d1f01895a13 | |
| parent | ae9f21cbaee99bde9bb89d18df02372f0c8275e4 (diff) | |
| parent | e4299771b52eb530544f5da254ec817a430f1b06 (diff) | |
Merge "defconfig: sdm660: enable video for 32bit"
| -rw-r--r-- | arch/arm/configs/sdm660-perf_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/sdm660_defconfig | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/configs/sdm660-perf_defconfig b/arch/arm/configs/sdm660-perf_defconfig index 73c12f90016c..7df369de029a 100644 --- a/arch/arm/configs/sdm660-perf_defconfig +++ b/arch/arm/configs/sdm660-perf_defconfig @@ -378,6 +378,9 @@ CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA=y CONFIG_MSM_CAMERA_DEBUG=y +CONFIG_MSM_VIDC_V4L2=y +CONFIG_MSM_VIDC_VMEM=y +CONFIG_MSM_VIDC_GOVERNORS=y CONFIG_MSM_SDE_ROTATOR=y CONFIG_DVB_MPQ=m CONFIG_DVB_MPQ_DEMUX=m diff --git a/arch/arm/configs/sdm660_defconfig b/arch/arm/configs/sdm660_defconfig index 5c8dbe8e8302..3a757a7dc7b5 100644 --- a/arch/arm/configs/sdm660_defconfig +++ b/arch/arm/configs/sdm660_defconfig @@ -376,8 +376,9 @@ CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_MSM_CAMERA=y CONFIG_MSM_CAMERA_DEBUG=y -CONFIG_MSM_VIDC_V4L2=m -CONFIG_MSM_VIDC_GOVERNORS=m +CONFIG_MSM_VIDC_V4L2=y +CONFIG_MSM_VIDC_VMEM=y +CONFIG_MSM_VIDC_GOVERNORS=y CONFIG_MSM_SDE_ROTATOR=y CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y CONFIG_DVB_MPQ=m |