From 52eba6702d4f03fb1351011f52e8b12df096eb16 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 15 Sep 2012 12:35:08 -0300 Subject: [PATCH] --- yaml --- r: 331007 b: refs/heads/master c: aa740e0a6fd5fe6ab59a95d67d8756c77df3fa66 h: refs/heads/master i: 331005: ae7e7004246a8baa6ccdf9b874463074f866df0e 331003: 5128f868869678868da570eb2f4336dde9f49dd8 330999: f0bddbc462aa17713638c7511047ed2757ab7cfe 330991: 0dc475f005dc43847d8ccfe751a996a767e5d543 330975: 5820be86e5057ce5c5bf633ed0539ee167165baa 330943: 0ef200a4c1073590052d95bef96919f3fd4a9690 330879: 82039017d11536bc2675307f46a71aad84308d04 330751: dbf7d58fbf7b435650df8d62fac8e772c464387e v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/Kconfig | 1 + trunk/drivers/media/platform/Makefile | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c6e7aa93112f..a85ff9ed6cc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 328728312178fd29064f45c458377ce5cbe314ba +refs/heads/master: aa740e0a6fd5fe6ab59a95d67d8756c77df3fa66 diff --git a/trunk/drivers/media/platform/Kconfig b/trunk/drivers/media/platform/Kconfig index 682594e43178..aa84d1db8c76 100644 --- a/trunk/drivers/media/platform/Kconfig +++ b/trunk/drivers/media/platform/Kconfig @@ -184,6 +184,7 @@ 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/trunk/drivers/media/platform/Makefile b/trunk/drivers/media/platform/Makefile index baaa55026c8e..12d34c4eb0f8 100644 --- a/trunk/drivers/media/platform/Makefile +++ b/trunk/drivers/media/platform/Makefile @@ -33,7 +33,9 @@ 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/ + +# FIXME!!! This driver is broken, as there's no makefile there! +#obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC) += exynos-gsc/ obj-$(CONFIG_BLACKFIN) += blackfin/