From patchwork Thu May 15 18:37:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 4185291 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C60AC9F1C0 for ; Thu, 15 May 2014 18:38:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDAE820380 for ; Thu, 15 May 2014 18:38:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 157E72034B for ; Thu, 15 May 2014 18:38:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754453AbaEOShs (ORCPT ); Thu, 15 May 2014 14:37:48 -0400 Received: from cpsmtpb-ews05.kpnxchange.com ([213.75.39.8]:60632 "EHLO cpsmtpb-ews05.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753928AbaEOShs (ORCPT ); Thu, 15 May 2014 14:37:48 -0400 Received: from cpsps-ews23.kpnxchange.com ([10.94.84.189]) by cpsmtpb-ews05.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 20:37:46 +0200 Received: from CPSMTPM-TLF103.kpnxchange.com ([195.121.3.6]) by cpsps-ews23.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 20:37:46 +0200 Received: from [192.168.10.106] ([195.240.213.44]) by CPSMTPM-TLF103.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 20:37:46 +0200 Message-ID: <1400179065.11786.14.camel@x220> Subject: [PATCH] ARM: OMAP: omap3stalker: remove two Kconfig macros From: Paul Bolle To: Tony Lindgren , Russell King Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Date: Thu, 15 May 2014 20:37:45 +0200 X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) Mime-Version: 1.0 X-OriginalArrivalTime: 15 May 2014 18:37:46.0307 (UTC) FILETIME=[C3EF9130:01CF706C] X-RcptDomain: vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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, };