aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/Kconfig1
-rw-r--r--drivers/media/platform/Makefile4
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 682594e43178..aa84d1db8c76 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -184,6 +184,7 @@ config VIDEO_MX2_EMMAPRP
184config VIDEO_SAMSUNG_EXYNOS_GSC 184config VIDEO_SAMSUNG_EXYNOS_GSC
185 tristate "Samsung Exynos G-Scaler driver" 185 tristate "Samsung Exynos G-Scaler driver"
186 depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_EXYNOS5 186 depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_EXYNOS5
187 depends on BROKEN
187 select VIDEOBUF2_DMA_CONTIG 188 select VIDEOBUF2_DMA_CONTIG
188 select V4L2_MEM2MEM_DEV 189 select V4L2_MEM2MEM_DEV
189 help 190 help
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index baaa55026c8e..12d34c4eb0f8 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -33,7 +33,9 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/
33obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/ 33obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/
34 34
35obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ 35obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/
36obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ 36
37# FIXME!!! This driver is broken, as there's no makefile there!
38#obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/
37 39
38obj-$(CONFIG_BLACKFIN) += blackfin/ 40obj-$(CONFIG_BLACKFIN) += blackfin/
39 41