Message ID | 1412611806-9346-1-git-send-email-s.nawrocki@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, 2014-10-06 at 18:10 +0200, Sylwester Nawrocki wrote: > 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. > > Reported-by: Paul Bolle <pebolle@tiscali.nl> > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Thanks for picking this up! Should Fixes: d78c16ccde96 ("ARM: SAMSUNG: Remove remaining legacy code") be added so this will end up in stable for v3.17? > 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(-) > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index bee9074..3aac88f 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 77c9512..b7b2e47 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 a9d56f8..beb180e 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 Paul Bolle -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/10/14 18:36, Paul Bolle wrote: > On Mon, 2014-10-06 at 18:10 +0200, Sylwester Nawrocki wrote: >> > 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. >> > >> > Reported-by: Paul Bolle <pebolle@tiscali.nl> >> > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> > > Thanks for picking this up! > > Should > Fixes: d78c16ccde96 ("ARM: SAMSUNG: Remove remaining legacy code") > > be added so this will end up in stable for v3.17? Thanks for the suggestion. I will add it to the commit description and Cc stable before including the patch in a pull request to Mauro. And will resend the other patch. -- Regards, Sylwester -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index bee9074..3aac88f 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 77c9512..b7b2e47 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 a9d56f8..beb180e 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
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. Reported-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> --- 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(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html