Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9cd3654 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm8909: Enable camera driver config"

parents 67efdd56 af8673fa

arch/arm/configs/msm8909-1gb_defconfig

+15 −3
Original line number Diff line number Diff line
@@ -333,6 +333,21 @@ CONFIG_REGULATOR_RPM_SMD=y 
CONFIG_REGULATOR_QPNP=y

CONFIG_REGULATOR_SPM=y

CONFIG_REGULATOR_CPR=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEOBUF2_MSM_MEM=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_KGSL=y

CONFIG_KGSL_PER_PROCESS_PAGE_TABLE=y

CONFIG_FB=y
@@ -534,9 +549,6 @@ CONFIG_CRYPTO_XCBC=y 
CONFIG_CRYPTO_SHA256=y

CONFIG_QMI_ENCDEC=y

CONFIG_MSM_BUSPM_DEV=m

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_RADIO_SUPPORT=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_RADIO_IRIS=y

CONFIG_RADIO_IRIS_TRANSPORT=m

arch/arm/configs/msm8909_defconfig

+3 −6
Original line number Diff line number Diff line
@@ -332,21 +332,21 @@ CONFIG_REGULATOR_RPM_SMD=y 
CONFIG_REGULATOR_QPNP=y

CONFIG_REGULATOR_SPM=y

CONFIG_REGULATOR_CPR=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEOBUF2_MSM_MEM=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_SOC_CAMERA=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_CCI=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF=y

CONFIG_MSM_ISPIF_V1=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_KGSL=y

CONFIG_KGSL_PER_PROCESS_PAGE_TABLE=y

CONFIG_FB=y
@@ -548,9 +548,6 @@ CONFIG_CRYPTO_XCBC=y 
CONFIG_CRYPTO_SHA256=y

CONFIG_QMI_ENCDEC=y

CONFIG_MSM_BUSPM_DEV=m

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_RADIO_SUPPORT=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_RADIO_IRIS=y

CONFIG_RADIO_IRIS_TRANSPORT=m