diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-15 14:09:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-15 14:09:57 -0400 |
commit | 2e59d4d14355ed615f80c763850c9913dfaa30d7 (patch) | |
tree | 8743af39177a8c70c96f1b75a23fb1840396b851 /drivers/media | |
parent | ebf6b78ebbc4877d80e6d7046301dfe4dbb2ac10 (diff) |
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 <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/Kconfig | 1 | ||||
-rw-r--r-- | drivers/media/platform/Makefile | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index aa84d1db8c7..682594e4317 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig | |||
@@ -184,7 +184,6 @@ config VIDEO_MX2_EMMAPRP | |||
184 | config VIDEO_SAMSUNG_EXYNOS_GSC | 184 | config 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 | ||
188 | select VIDEOBUF2_DMA_CONTIG | 187 | select VIDEOBUF2_DMA_CONTIG |
189 | select V4L2_MEM2MEM_DEV | 188 | select V4L2_MEM2MEM_DEV |
190 | help | 189 | help |
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 12d34c4eb0f..baaa55026c8 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile | |||
@@ -33,9 +33,7 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC) += s5p-mfc/ | |||
33 | obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/ | 33 | obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV) += s5p-tv/ |
34 | 34 | ||
35 | obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ | 35 | obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D) += s5p-g2d/ |
36 | 36 | obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ | |
37 | # FIXME!!! This driver is broken, as there's no makefile there! | ||
38 | #obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ | ||
39 | 37 | ||
40 | obj-$(CONFIG_BLACKFIN) += blackfin/ | 38 | obj-$(CONFIG_BLACKFIN) += blackfin/ |
41 | 39 | ||