diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-15 20:37:45 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-05-16 23:10:04 +0200 |
| commit | d8c270a874e9586ca8c8f888e47a9e3b8878dca9 (patch) | |
| tree | 110e6a756fdc1a8f08fae63f15095f8af9f744f8 /arch/arm/mach-omap2/board-omap3stalker.c | |
| parent | ARM: OMAP2+: Add support for RNG on DT booted N900 (diff) | |
| download | linux-d8c270a874e9586ca8c8f888e47a9e3b8878dca9.tar.xz linux-d8c270a874e9586ca8c8f888e47a9e3b8878dca9.zip | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 4 |
1 files changed, 0 insertions, 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, }; |