From 3a5dcebd708797579c331e4f7cf3b84caf264cc6 Mon Sep 17 00:00:00 2001 From: Shaik Ameer Basha Date: Thu, 16 Aug 2012 10:19:56 -0300 Subject: [PATCH] --- yaml --- r: 330990 b: refs/heads/master c: 655ceff16b45c8471f783be8f804648e66969aab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/Kconfig | 8 ++++++++ trunk/drivers/media/platform/Makefile | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ab8295a66461..4eb725952dcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d71833804a18d84f34de6eade58c771923161cd +refs/heads/master: 655ceff16b45c8471f783be8f804648e66969aab diff --git a/trunk/drivers/media/platform/Kconfig b/trunk/drivers/media/platform/Kconfig index d4c034d2bd8d..682594e43178 100644 --- a/trunk/drivers/media/platform/Kconfig +++ b/trunk/drivers/media/platform/Kconfig @@ -181,6 +181,14 @@ config VIDEO_MX2_EMMAPRP memory to memory. Operations include resizing and format conversion. +config VIDEO_SAMSUNG_EXYNOS_GSC + tristate "Samsung Exynos G-Scaler driver" + depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_EXYNOS5 + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + help + This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler. + endif # V4L_MEM2MEM_DRIVERS menuconfig V4L_TEST_DRIVERS diff --git a/trunk/drivers/media/platform/Makefile b/trunk/drivers/media/platform/Makefile index 92127773237c..baaa55026c8e 100644 --- a/trunk/drivers/media/platform/Makefile +++ b/trunk/drivers/media/platform/Makefile @@ -33,6 +33,7 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ +obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ obj-$(CONFIG_BLACKFIN) += blackfin/