Modifies the exynos5-is Makefile and Kconfig to include the new fimc-is driver. Signed-off-by: Arun Kumar K <arun.kk@xxxxxxxxxxx> Signed-off-by: Kilyeon Im <kilyeon.im@xxxxxxxxxxx> --- drivers/media/platform/exynos5-is/Kconfig | 12 ++++++++++++ drivers/media/platform/exynos5-is/Makefile | 3 +++ 2 files changed, 15 insertions(+) diff --git a/drivers/media/platform/exynos5-is/Kconfig b/drivers/media/platform/exynos5-is/Kconfig index 7aacf3b..588103e 100644 --- a/drivers/media/platform/exynos5-is/Kconfig +++ b/drivers/media/platform/exynos5-is/Kconfig @@ -5,3 +5,15 @@ config VIDEO_SAMSUNG_EXYNOS5_MDEV This is a v4l2 based media controller driver for Exynos5 SoC. +if VIDEO_SAMSUNG_EXYNOS5_MDEV + +config VIDEO_SAMSUNG_EXYNOS5_FIMC_IS + tristate "Samsung Exynos5 SoC FIMC-IS driver" + depends on VIDEO_V4L2_SUBDEV_API + depends on VIDEO_SAMSUNG_EXYNOS5_MDEV + select VIDEOBUF2_DMA_CONTIG + help + This is a v4l2 driver for Samsung Exynos5 SoC series Imaging + subsystem known as FIMC-IS. + +endif #VIDEO_SAMSUNG_EXYNOS5_MDEV diff --git a/drivers/media/platform/exynos5-is/Makefile b/drivers/media/platform/exynos5-is/Makefile index 472d8e1..e5003d0 100644 --- a/drivers/media/platform/exynos5-is/Makefile +++ b/drivers/media/platform/exynos5-is/Makefile @@ -1,4 +1,7 @@ ccflags-y += -Idrivers/media/platform/s5p-fimc +exynos5-fimc-is-objs := fimc-is-core.o fimc-is-isp.o fimc-is-scaler.o fimc-is-sensor.o +exynos5-fimc-is-objs += fimc-is-pipeline.o fimc-is-interface.o exynos-mdevice-objs := exynos5-mdev.o +obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS5_FIMC_IS) += exynos5-fimc-is.o obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS5_MDEV) += exynos-mdevice.o -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html