summaryrefslogtreecommitdiff
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2015-08-06 15:39:42 +0200
committerSeung-Woo Kim <sw0312.kim@samsung.com>2016-12-14 13:47:26 +0900
commit635464e5615a141681c6d6b06571e1e75e195222 (patch)
tree846d20f55b34b1dae0e9f0d28efce731549d12ae /drivers/media/platform
parentfd2515e93c81c61c0c54549edd41ad9af672a558 (diff)
fimc-is: enable build
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/Kconfig2
-rw-r--r--drivers/media/platform/Makefile1
-rw-r--r--drivers/media/platform/exynos/fimc-is/Kconfig2
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 059a46f2c4a4..f16f4497bccb 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -33,6 +33,8 @@ source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/blackfin/Kconfig"
+source "drivers/media/platform/exynos/fimc-is/Kconfig"
+
config VIDEO_SH_VOU
tristate "SuperH VOU video output driver"
depends on MEDIA_CAMERA_SUPPORT
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 8f855616c237..990e9a5e3ebd 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
obj-$(CONFIG_VIDEO_S3C_CAMIF) += s3c-camif/
obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS) += exynos4-is/
+obj-$(CONFIG_VIDEO_EXYNOS_FIMC_IS) += exynos/fimc-is/
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG) += s5p-jpeg/
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/
obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/
diff --git a/drivers/media/platform/exynos/fimc-is/Kconfig b/drivers/media/platform/exynos/fimc-is/Kconfig
index 13ce508d878d..a31db138793d 100644
--- a/drivers/media/platform/exynos/fimc-is/Kconfig
+++ b/drivers/media/platform/exynos/fimc-is/Kconfig
@@ -1,8 +1,8 @@
config VIDEO_EXYNOS_FIMC_IS
bool "Exynos FIMC-IS (Image Subsystem) driver"
- depends on VIDEO_EXYNOS
select MEDIA_EXYNOS
select USE_VENDER_FEATURE
+ select VIDEOBUF2_DMA_CONTIG
default n
help
This is a v4l2 driver for exynos FIMC-IS device.