Merge "Revert "defconfig: msm: Modify tv tuner config in MSM8996""
This commit is contained in:
commit
f6d12408a2
2 changed files with 2 additions and 2 deletions
|
@ -387,7 +387,7 @@ CONFIG_MSM_AIS_DEBUG=y
|
||||||
CONFIG_MSM_AIS_CAMERA_SENSOR=y
|
CONFIG_MSM_AIS_CAMERA_SENSOR=y
|
||||||
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
|
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
|
||||||
CONFIG_VIDEO_ADV7481=m
|
CONFIG_VIDEO_ADV7481=m
|
||||||
CONFIG_VIDEO_TVTUNER=y
|
CONFIG_VIDEO_TVTUNER=m
|
||||||
CONFIG_QCOM_KGSL=y
|
CONFIG_QCOM_KGSL=y
|
||||||
CONFIG_DRM=y
|
CONFIG_DRM=y
|
||||||
CONFIG_MSM_BA_V4L2=y
|
CONFIG_MSM_BA_V4L2=y
|
||||||
|
|
|
@ -391,7 +391,7 @@ CONFIG_MSM_AIS_DEBUG=y
|
||||||
CONFIG_MSM_AIS_CAMERA_SENSOR=y
|
CONFIG_MSM_AIS_CAMERA_SENSOR=y
|
||||||
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
|
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
|
||||||
CONFIG_VIDEO_ADV7481=m
|
CONFIG_VIDEO_ADV7481=m
|
||||||
CONFIG_VIDEO_TVTUNER=y
|
CONFIG_VIDEO_TVTUNER=m
|
||||||
CONFIG_QCOM_KGSL=y
|
CONFIG_QCOM_KGSL=y
|
||||||
CONFIG_DRM=y
|
CONFIG_DRM=y
|
||||||
CONFIG_MSM_BA_V4L2=y
|
CONFIG_MSM_BA_V4L2=y
|
||||||
|
|
Loading…
Add table
Reference in a new issue