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

Commit d8c270a8 authored by Paul Bolle's avatar Paul Bolle Committed by Tony Lindgren
Browse files

ARM: OMAP: omap3stalker: remove two Kconfig macros 



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: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 14c0a5b4

arch/arm/mach-omap2/board-omap3stalker.c

+0 −4
Original line number Diff line number Diff line
@@ -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,

};