diff mbox

ARM: OMAP: omap3stalker: remove two Kconfig macros

Message ID 1400179065.11786.14.camel@x220 (mailing list archive)
State New, archived
Headers show

Commit Message

Paul Bolle May 15, 2014, 6:37 p.m. UTC
Checks for CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO and
CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE were added in v2.6.35. But the
related Kconfig symbols have never been added to the tree. Remove these
checks.

Initialize connector_type to OMAP_DSS_VENC_TYPE_COMPOSITE explicitly.
That's what's happening currently: OMAP_DSS_VENC_TYPE_COMPOSITE equals
zero and connector_type remains zero since both checks currently fail.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Untested.

 arch/arm/mach-omap2/board-omap3stalker.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Tony Lindgren May 16, 2014, 9:10 p.m. UTC | #1
* Paul Bolle <pebolle@tiscali.nl> [140515 11:38]:
> Checks for CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO and
> CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE were added in v2.6.35. But the
> related Kconfig symbols have never been added to the tree. Remove these
> checks.
> 
> Initialize connector_type to OMAP_DSS_VENC_TYPE_COMPOSITE explicitly.
> That's what's happening currently: OMAP_DSS_VENC_TYPE_COMPOSITE equals
> zero and connector_type remains zero since both checks currently fail.

Thanks applying into omap-for-v3.16/board.

Tony
 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Untested.
> 
>  arch/arm/mach-omap2/board-omap3stalker.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
> index 119efaf5808a..a2e035e0792a 100644
> --- a/arch/arm/mach-omap2/board-omap3stalker.c
> +++ b/arch/arm/mach-omap2/board-omap3stalker.c
> @@ -121,11 +121,7 @@ static struct platform_device omap3stalker_tfp410_device = {
>  static struct connector_atv_platform_data omap3stalker_tv_pdata = {
>  	.name = "tv",
>  	.source = "venc.0",
> -#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
> -	.connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
> -#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
>  	.connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
> -#endif
>  	.invert_polarity = false,
>  };
>  
> -- 
> 1.9.0
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index 119efaf5808a..a2e035e0792a 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -121,11 +121,7 @@  static struct platform_device omap3stalker_tfp410_device = {
 static struct connector_atv_platform_data omap3stalker_tv_pdata = {
 	.name = "tv",
 	.source = "venc.0",
-#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
-	.connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
-#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
 	.connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
-#endif
 	.invert_polarity = false,
 };