3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index bee9074ebc13..3aac88f1d54a 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -166,7 +166,7 @@ config VIDEO_MEM2MEM_DEINTERLACE
 config VIDEO_SAMSUNG_S5P_G2D
        tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
        depends on VIDEO_DEV && VIDEO_V4L2
-        depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
+        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
        depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
@@ -178,7 +178,7 @@ config VIDEO_SAMSUNG_S5P_G2D
 config VIDEO_SAMSUNG_S5P_JPEG
        tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
        depends on VIDEO_DEV && VIDEO_V4L2
-        depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
+        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
        depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
@@ -189,7 +189,7 @@ config VIDEO_SAMSUNG_S5P_JPEG
 config VIDEO_SAMSUNG_S5P_MFC
        tristate "Samsung S5P MFC Video Codec"
        depends on VIDEO_DEV && VIDEO_V4L2
-        depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
+        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
        depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        default n
diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
index 77c951237744..b7b2e472240a 100644
--- a/drivers/media/platform/exynos4-is/Kconfig
+++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -2,7 +2,7 @@
 config VIDEO_SAMSUNG_EXYNOS4_IS
        bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
        depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
-        depends on (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST)
+        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
        depends on OF && COMMON_CLK
        help
          Say Y here to enable camera host interface devices for
diff --git a/drivers/media/platform/s5p-tv/Kconfig b/drivers/media/platform/s5p-tv/Kconfig
index a9d56f8936b4..beb180e71ba0 100644
--- a/drivers/media/platform/s5p-tv/Kconfig
+++ b/drivers/media/platform/s5p-tv/Kconfig
@@ -9,7 +9,7 @@
 config VIDEO_SAMSUNG_S5P_TV
        bool "Samsung TV driver for S5P platform"
        depends on PM_RUNTIME
-        depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST
+        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
        default n
        ---help---
          Say Y here to enable selecting the TV output devices for

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index bee9074ebc13..3aac88f1d54a 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig
@@ -166,7 +166,7 @@ config VIDEO_MEM2MEM_DEINTERLACE
166	config VIDEO_SAMSUNG_S5P_G2D	166	config VIDEO_SAMSUNG_S5P_G2D
167	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"	167	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
168	depends on VIDEO_DEV && VIDEO_V4L2	168	depends on VIDEO_DEV && VIDEO_V4L2
169	depends on PLAT_S5P \|\| ARCH_EXYNOS \|\| COMPILE_TEST	169	depends on ARCH_S5PV210 \|\| ARCH_EXYNOS \|\| COMPILE_TEST
170	depends on HAS_DMA	170	depends on HAS_DMA
171	select VIDEOBUF2_DMA_CONTIG	171	select VIDEOBUF2_DMA_CONTIG
172	select V4L2_MEM2MEM_DEV	172	select V4L2_MEM2MEM_DEV
@@ -178,7 +178,7 @@ config VIDEO_SAMSUNG_S5P_G2D
178	config VIDEO_SAMSUNG_S5P_JPEG	178	config VIDEO_SAMSUNG_S5P_JPEG
179	tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"	179	tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
180	depends on VIDEO_DEV && VIDEO_V4L2	180	depends on VIDEO_DEV && VIDEO_V4L2
181	depends on PLAT_S5P \|\| ARCH_EXYNOS \|\| COMPILE_TEST	181	depends on ARCH_S5PV210 \|\| ARCH_EXYNOS \|\| COMPILE_TEST
182	depends on HAS_DMA	182	depends on HAS_DMA
183	select VIDEOBUF2_DMA_CONTIG	183	select VIDEOBUF2_DMA_CONTIG
184	select V4L2_MEM2MEM_DEV	184	select V4L2_MEM2MEM_DEV
@@ -189,7 +189,7 @@ config VIDEO_SAMSUNG_S5P_JPEG
189	config VIDEO_SAMSUNG_S5P_MFC	189	config VIDEO_SAMSUNG_S5P_MFC
190	tristate "Samsung S5P MFC Video Codec"	190	tristate "Samsung S5P MFC Video Codec"
191	depends on VIDEO_DEV && VIDEO_V4L2	191	depends on VIDEO_DEV && VIDEO_V4L2
192	depends on PLAT_S5P \|\| ARCH_EXYNOS \|\| COMPILE_TEST	192	depends on ARCH_S5PV210 \|\| ARCH_EXYNOS \|\| COMPILE_TEST
193	depends on HAS_DMA	193	depends on HAS_DMA
194	select VIDEOBUF2_DMA_CONTIG	194	select VIDEOBUF2_DMA_CONTIG
195	default n	195	default n


diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig index 77c951237744..b7b2e472240a 100644 --- a/drivers/media/platform/exynos4-is/Kconfig +++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -2,7 +2,7 @@
2	config VIDEO_SAMSUNG_EXYNOS4_IS	2	config VIDEO_SAMSUNG_EXYNOS4_IS
3	bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"	3	bool "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
4	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API	4	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
5	depends on (PLAT_S5P \|\| ARCH_EXYNOS \|\| COMPILE_TEST)	5	depends on ARCH_S5PV210 \|\| ARCH_EXYNOS \|\| COMPILE_TEST
6	depends on OF && COMMON_CLK	6	depends on OF && COMMON_CLK
7	help	7	help
8	Say Y here to enable camera host interface devices for	8	Say Y here to enable camera host interface devices for


diff --git a/drivers/media/platform/s5p-tv/Kconfig b/drivers/media/platform/s5p-tv/Kconfig index a9d56f8936b4..beb180e71ba0 100644 --- a/drivers/media/platform/s5p-tv/Kconfig +++ b/drivers/media/platform/s5p-tv/Kconfig
@@ -9,7 +9,7 @@
9	config VIDEO_SAMSUNG_S5P_TV	9	config VIDEO_SAMSUNG_S5P_TV
10	bool "Samsung TV driver for S5P platform"	10	bool "Samsung TV driver for S5P platform"
11	depends on PM_RUNTIME	11	depends on PM_RUNTIME
12	depends on PLAT_S5P \|\| ARCH_EXYNOS \|\| COMPILE_TEST	12	depends on ARCH_S5PV210 \|\| ARCH_EXYNOS \|\| COMPILE_TEST
13	default n	13	default n
14	---help---	14	---help---
15	Say Y here to enable selecting the TV output devices for	15	Say Y here to enable selecting the TV output devices for