aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/Kconfig19
-rw-r--r--drivers/media/video/Makefile1
2 files changed, 12 insertions, 8 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index d61414eaab21..a7054935da5f 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -934,6 +934,17 @@ config VIDEO_MX2
934 This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor 934 This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor
935 Interface 935 Interface
936 936
937config VIDEO_SAMSUNG_S5P_FIMC
938 tristate "Samsung S5P and EXYNOS4 camera host interface driver"
939 depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P
940 select VIDEOBUF2_DMA_CONTIG
941 select V4L2_MEM2MEM_DEV
942 ---help---
943 This is a v4l2 driver for Samsung S5P and EXYNOS4 camera
944 host interface and video postprocessor.
945
946 To compile this driver as a module, choose M here: the
947 module will be called s5p-fimc.
937 948
938# 949#
939# USB Multimedia device configuration 950# USB Multimedia device configuration
@@ -1029,13 +1040,5 @@ config VIDEO_MEM2MEM_TESTDEV
1029 This is a virtual test device for the memory-to-memory driver 1040 This is a virtual test device for the memory-to-memory driver
1030 framework. 1041 framework.
1031 1042
1032config VIDEO_SAMSUNG_S5P_FIMC
1033 tristate "Samsung S5P FIMC (video postprocessor) driver"
1034 depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P
1035 select VIDEOBUF2_DMA_CONTIG
1036 select V4L2_MEM2MEM_DEV
1037 help
1038 This is a v4l2 driver for the S5P camera interface
1039 (video postprocessor)
1040 1043
1041endif # V4L_MEM2MEM_DRIVERS 1044endif # V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index a10e4c3153fa..9519160c2e01 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -165,6 +165,7 @@ obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
165obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2) += sh_mobile_csi2.o 165obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2) += sh_mobile_csi2.o
166obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o 166obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o
167obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o 167obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o
168
168obj-$(CONFIG_VIDEO_SAMSUNG_S5P_FIMC) += s5p-fimc/ 169obj-$(CONFIG_VIDEO_SAMSUNG_S5P_FIMC) += s5p-fimc/
169 170
170obj-$(CONFIG_ARCH_DAVINCI) += davinci/ 171obj-$(CONFIG_ARCH_DAVINCI) += davinci/