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: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
14c0a5b4b9
commit
d8c270a874
@ -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,
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user