diff options
| author | Guoniu.Zhou <guoniu.zhou@nxp.com> | 2018-09-17 18:20:31 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2018-10-29 11:10:38 +0800 |
| commit | 910247c2c0dae319f4d7f49b791f457fbaca1f1a (patch) | |
| tree | 6a91f5aa20fbe82532f77045f98fb804f750520c /drivers/media/platform | |
| parent | bddd330b01192a0a986afb50b0edc0712953994c (diff) | |
MLK-19437: jpeg: fix kernel build fail when set JPEG driver be module
Fix kernel build fail when set JPEG driver be module
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/imx8/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/platform/imx8/Makefile | 3 | ||||
| -rw-r--r-- | drivers/media/platform/mxc/capture/Kconfig | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/imx8/Kconfig b/drivers/media/platform/imx8/Kconfig index b8c4a985812c..bf3a0a8e2850 100644 --- a/drivers/media/platform/imx8/Kconfig +++ b/drivers/media/platform/imx8/Kconfig @@ -23,6 +23,7 @@ config IMX8_PARALLEL_CSI config IMX8_MIPI_CSI2_YAV tristate "IMX8 MIPI CSI2 Controller Yet Another Version" + select V4L2_FWNODE default y config MXC_CAMERA_OV5640_V3 diff --git a/drivers/media/platform/imx8/Makefile b/drivers/media/platform/imx8/Makefile index 5dc1802f3a3a..097a91b3c639 100644 --- a/drivers/media/platform/imx8/Makefile +++ b/drivers/media/platform/imx8/Makefile @@ -10,5 +10,6 @@ obj-$(CONFIG_MXC_CAMERA_OV5640_MIPI_V3) += ov5640_mipi_v3.o max9286_gmsl-objs := max9286.o obj-$(CONFIG_GMSL_MAX9286) += max9286_gmsl.o obj-$(CONFIG_IMX8_MEDIA_DEVICE) += mxc-media-dev.o -obj-$(CONFIG_IMX8_JPEG) += mxc-jpeg-hw.o mxc-jpeg.o +mxc-jpeg-enc-dec-objs := mxc-jpeg-hw.o mxc-jpeg.o +obj-$(CONFIG_IMX8_JPEG) += mxc-jpeg-enc-dec.o obj-$(CONFIG_IMX8_HDMI_RX) += hdmi/ diff --git a/drivers/media/platform/mxc/capture/Kconfig b/drivers/media/platform/mxc/capture/Kconfig index 2aa4e1505735..040b6a051d04 100644 --- a/drivers/media/platform/mxc/capture/Kconfig +++ b/drivers/media/platform/mxc/capture/Kconfig @@ -6,6 +6,7 @@ config VIDEO_V4L2_MXC_INT_DEVICE config VIDEO_MXC_CSI_CAMERA tristate "CSI camera support" depends on VIDEO_MXC_CAPTURE && VIDEO_V4L2 + select VIDEOBUF2_DMA_CONTIG ---help--- This is the video4linux2 capture driver based on CSI module. |