diff --git a/[refs] b/[refs]
index d056768f0ad7..4757d7eeca54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaf675f53a7176475f69595827248c8b2556ea8c
+refs/heads/master: 8cf5e2a97626a03a78be80ea6d235f038c6ad16b
diff --git a/trunk/drivers/media/platform/s5p-fimc/Kconfig b/trunk/drivers/media/platform/s5p-fimc/Kconfig
index a564f7eeb064..8f090a8f270e 100644
--- a/trunk/drivers/media/platform/s5p-fimc/Kconfig
+++ b/trunk/drivers/media/platform/s5p-fimc/Kconfig
@@ -31,7 +31,7 @@ config VIDEO_S5P_MIPI_CSIS
 	  To compile this driver as a module, choose M here: the
 	  module will be called s5p-csis.
 
-if ARCH_EXYNOS
+if SOC_EXYNOS4212 || SOC_EXYNOS4412 || SOC_EXYNOS5250
 
 config VIDEO_EXYNOS_FIMC_LITE
 	tristate "EXYNOS FIMC-LITE camera interface driver"