Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 098bcd23 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] Remove references to non-existent PLAT_S5P symbol 



The PLAT_S5P Kconfig symbol was removed in commit d78c16cc
("ARM: SAMSUNG: Remove remaining legacy code"). However, there
are still some references to that symbol left, fix that by
substituting them with ARCH_S5PV210.

Fixes: d78c16cc ("ARM: SAMSUNG: Remove remaining legacy code")

Reported-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Cc: <stable@vger.kernel.org> # for 3.17
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8a6a547f

drivers/media/platform/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -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

drivers/media/platform/exynos4-is/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/platform/s5p-tv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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