---

yaml --- r: 331007 b: refs/heads/master c: aa740e0 h: refs/heads/master i: 331005: ae7e700 331003: 5128f86 330999: f0bddbc 330991: 0dc475f 330975: 5820be8 330943: 0ef200a 330879: 8203901 330751: dbf7d58 v: v3
git-mirror · Sep 15, 2012 · 52eba67 · 52eba67
1 parent 8c4ac6c
commit 52eba67
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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/