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

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

Merge "defconfig: msm: Enable 32-bit camera compilation for msm8937."

parents a3e80a55 56d079ac

arch/arm/configs/msm8953-perf_defconfig

+30 −2
Original line number Diff line number Diff line
@@ -351,7 +351,37 @@ CONFIG_MEDIA_SUPPORT=y 
CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_CAMERA=y

CONFIG_MSM_CAMERA_DEBUG=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSMB_CAMERA_DEBUG=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI20_HEADER=y

CONFIG_MSM_CSI22_HEADER=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF_V2=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

CONFIG_OV5648=y

CONFIG_GC0339=y

CONFIG_OV8825=y

CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_MSM_JPEGDMA=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_QCOM_KGSL=y
@@ -444,8 +474,6 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM_ICE=y

CONFIG_MMC_CQ_HCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y

arch/arm/configs/msm8953_defconfig

+30 −2
Original line number Diff line number Diff line
@@ -362,7 +362,37 @@ CONFIG_MEDIA_SUPPORT=y 
CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_CAMERA=y

CONFIG_MSM_CAMERA_DEBUG=y

CONFIG_MSMB_CAMERA=y

CONFIG_MSMB_CAMERA_DEBUG=y

CONFIG_MSM_CAMERA_SENSOR=y

CONFIG_MSM_CPP=y

CONFIG_MSM_CCI=y

CONFIG_MSM_CSI20_HEADER=y

CONFIG_MSM_CSI22_HEADER=y

CONFIG_MSM_CSI30_HEADER=y

CONFIG_MSM_CSI31_HEADER=y

CONFIG_MSM_CSIPHY=y

CONFIG_MSM_CSID=y

CONFIG_MSM_EEPROM=y

CONFIG_MSM_ISPIF_V2=y

CONFIG_IMX134=y

CONFIG_IMX132=y

CONFIG_OV9724=y

CONFIG_OV5648=y

CONFIG_GC0339=y

CONFIG_OV8825=y

CONFIG_OV8865=y

CONFIG_s5k4e1=y

CONFIG_OV12830=y

CONFIG_MSM_V4L2_VIDEO_OVERLAY_DEVICE=y

CONFIG_MSMB_JPEG=y

CONFIG_MSM_FD=y

CONFIG_MSM_JPEGDMA=y

CONFIG_MSM_VIDC_3X_V4L2=y

CONFIG_MSM_VIDC_3X_GOVERNORS=y

CONFIG_QCOM_KGSL=y
@@ -457,8 +487,6 @@ CONFIG_MMC_SDHCI_PLTFM=y 
CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM_ICE=y

CONFIG_MMC_CQ_HCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_QTI_TRI_LED=y

CONFIG_LEDS_QPNP=y

CONFIG_LEDS_QPNP_FLASH=y