diff --git a/[refs] b/[refs]
index 66878e29be59..2c14db57d5db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebf6b78ebbc4877d80e6d7046301dfe4dbb2ac10
+refs/heads/master: 2e59d4d14355ed615f80c763850c9913dfaa30d7
diff --git a/trunk/drivers/media/platform/Kconfig b/trunk/drivers/media/platform/Kconfig
index aa84d1db8c76..682594e43178 100644
--- a/trunk/drivers/media/platform/Kconfig
+++ b/trunk/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/trunk/drivers/media/platform/Makefile b/trunk/drivers/media/platform/Makefile
index 12d34c4eb0f8..baaa55026c8e 100644
--- a/trunk/drivers/media/platform/Makefile
+++ b/trunk/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/