From: Mauro Carvalho Chehab Date: Sat, 15 Sep 2012 18:09:57 +0000 (-0300) Subject: Revert "[media] gscaler: mark it as BROKEN" X-Git-Tag: firefly_0821_release~3680^2~275^2~1258 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2e59d4d14355ed615f80c763850c9913dfaa30d7;p=firefly-linux-kernel-4.4.55.git Revert "[media] gscaler: mark it as BROKEN" This reverts commit aa740e0a6fd5fe6ab59a95d67d8756c77df3fa66. Now that the Makefile got added, we can remove this one. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index aa84d1db8c76..682594e43178 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -184,7 +184,6 @@ config VIDEO_MX2_EMMAPRP config VIDEO_SAMSUNG_EXYNOS_GSC tristate "Samsung Exynos G-Scaler driver" depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_EXYNOS5 - depends on BROKEN select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV help diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 12d34c4eb0f8..baaa55026c8e 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -33,9 +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/ - -# FIXME!!! This driver is broken, as there's no makefile there! -#obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ +obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ obj-$(CONFIG_BLACKFIN) += blackfin/