| From 098bcd2335f0824e76dd835e4e2b7ae8e38fc281 Mon Sep 17 00:00:00 2001 |
| From: Sylwester Nawrocki <s.nawrocki@samsung.com> |
| Date: Mon, 6 Oct 2014 13:08:06 -0300 |
| Subject: media: Remove references to non-existent PLAT_S5P symbol |
| |
| From: Sylwester Nawrocki <s.nawrocki@samsung.com> |
| |
| commit 098bcd2335f0824e76dd835e4e2b7ae8e38fc281 upstream. |
| |
| The PLAT_S5P Kconfig symbol was removed in commit d78c16ccde96 |
| ("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: d78c16ccde96 ("ARM: SAMSUNG: Remove remaining legacy code") |
| |
| Reported-by: Paul Bolle <pebolle@tiscali.nl> |
| Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/platform/Kconfig | 6 +++--- |
| drivers/media/platform/exynos4-is/Kconfig | 2 +- |
| drivers/media/platform/s5p-tv/Kconfig | 2 +- |
| 3 files changed, 5 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/media/platform/Kconfig |
| +++ b/drivers/media/platform/Kconfig |
| @@ -158,7 +158,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 && (PLAT_S5P || ARCH_EXYNOS) |
| + depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_S5PV210 || ARCH_EXYNOS) |
| select VIDEOBUF2_DMA_CONTIG |
| select V4L2_MEM2MEM_DEV |
| default n |
| @@ -168,7 +168,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 && (PLAT_S5P || ARCH_EXYNOS) |
| + depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_S5PV210 || ARCH_EXYNOS) |
| select VIDEOBUF2_DMA_CONTIG |
| select V4L2_MEM2MEM_DEV |
| ---help--- |
| @@ -177,7 +177,7 @@ config VIDEO_SAMSUNG_S5P_JPEG |
| |
| config VIDEO_SAMSUNG_S5P_MFC |
| tristate "Samsung S5P MFC Video Codec" |
| - depends on VIDEO_DEV && VIDEO_V4L2 && (PLAT_S5P || ARCH_EXYNOS) |
| + depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_S5PV210 || ARCH_EXYNOS) |
| select VIDEOBUF2_DMA_CONTIG |
| default n |
| help |
| --- 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) |
| + depends on ARCH_S5PV210 || ARCH_EXYNOS |
| depends on OF && COMMON_CLK |
| help |
| Say Y here to enable camera host interface devices for |
| --- a/drivers/media/platform/s5p-tv/Kconfig |
| +++ b/drivers/media/platform/s5p-tv/Kconfig |
| @@ -8,7 +8,7 @@ |
| |
| config VIDEO_SAMSUNG_S5P_TV |
| bool "Samsung TV driver for S5P platform" |
| - depends on (PLAT_S5P || ARCH_EXYNOS) && PM_RUNTIME |
| + depends on (ARCH_S5PV210 || ARCH_EXYNOS) && PM_RUNTIME |
| default n |
| ---help--- |
| Say Y here to enable selecting the TV output devices for |