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

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

Merge "arm: defconfig: enable media framework and video driver"

parents 7d6707c8 574d59c6

arch/arm64/configs/msm_defconfig

+13 −0
Original line number Diff line number Diff line
@@ -304,3 +304,16 @@ CONFIG_DYNAMIC_DEBUG=y 
CONFIG_PANIC_ON_DATA_CORRUPTION=y

CONFIG_KEYS=y

CONFIG_QMI_ENCDEC=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

#CONFIG_MEDIA_ANALOG_TV_SUPPORT=y

#CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y

CONFIG_MEDIA_RADIO_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

CONFIG_VIDEO_DEV=y

CONFIG_VIDEO_V4L2_SUBDEV_API=y

CONFIG_VIDEOBUF2_MSM_MEM=y

CONFIG_MEDIA_USB_SUPPORT=y

CONFIG_USB_VIDEO_CLASS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_VIDC_V4L2=y

drivers/media/platform/msm/vidc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
menuconfig MSM_VIDC_V4L2

	bool "Qualcomm MSM V4L2 based video driver"

		depends on (ARCH_MSM8974 || ARCH_MSM8610 || ARCH_MSM8226 || ARCH_APQ8084 || \

			ARCH_MPQ8092 || ARCH_MSM8916) && VIDEO_V4L2
 
            ARCH_MPQ8092 || ARCH_MSM8916 || ARCH_MSM8994) && VIDEO_V4L2