From patchwork Tue May 15 20:13:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 8661 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9A6BE23E28 for ; Tue, 15 May 2012 20:13:19 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4419AA188CF for ; Tue, 15 May 2012 20:13:19 +0000 (UTC) Received: by yenq6 with SMTP id q6so7278447yen.11 for ; Tue, 15 May 2012 13:13:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:organization:references:date:in-reply-to:message-id :user-agent:mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=jrv64rnnZf6rbaKcn3iSzmCJKkhTLCI0SbRGXJ99Msg=; b=HhGIOY9FPfXuf76kBPrekVt7pUO7JPsxcGZuudlUfr6nUsxNgBYqs1MeqDJItAYH2F 6HLUirKIhku54D5O+mPQzlwqRZFTev8UupTmJlfvOc3EKVV0VYonHKa6zQQSFssL5mCQ 9SozuBgdS68kgOVbezPxcuxZFoB8auKJxFk9+IOSiSRxsNAWh/4aQzVug+3J7GGUChbP TWR8m8STwDlEs+3z4cAqZfIBQx3EVO7bYfy2y2Fs0OGxyp8+PyRk++umncyoxSbBftdM o0H+u/C154U44YMlf+vapVS+ptRMnIN/hJq+Xb0uTItO9PrzYsRBCbwYsKF6Qqt0awBv trAw== Received: by 10.50.163.99 with SMTP id yh3mr158086igb.53.1337112798503; Tue, 15 May 2012 13:13:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.35.72 with SMTP id o8csp445229ibd; Tue, 15 May 2012 13:13:17 -0700 (PDT) Received: by 10.68.203.66 with SMTP id ko2mr8948813pbc.84.1337112797088; Tue, 15 May 2012 13:13:17 -0700 (PDT) Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]) by mx.google.com with SMTP id kh6si242319pbc.10.2012.05.15.13.13.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 May 2012 13:13:17 -0700 (PDT) Received-SPF: pass (google.com: domain of khilman@ti.com designates 74.125.149.69 as permitted sender) client-ip=74.125.149.69; Authentication-Results: mx.google.com; spf=pass (google.com: domain of khilman@ti.com designates 74.125.149.69 as permitted sender) smtp.mail=khilman@ti.com Received: from mail-pb0-f42.google.com ([209.85.160.42]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKT7K43MYsi+l9En3gVlLns3XWp2PDQy6V@postini.com; Tue, 15 May 2012 13:13:16 PDT Received: by pbbrp12 with SMTP id rp12so112769pbb.29 for ; Tue, 15 May 2012 13:13:15 -0700 (PDT) Received: by 10.68.216.225 with SMTP id ot1mr8416298pbc.46.1337112795575; Tue, 15 May 2012 13:13:15 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id rs3sm2812127pbc.47.2012.05.15.13.13.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 May 2012 13:13:14 -0700 (PDT) From: Kevin Hilman To: Tony Lindgren Cc: Javier Martinez Canillas , Enric =?utf-8?Q?Balle?= =?utf-8?Q?tb=C3=B2?= i Serra , Russell King , linux-omap@vger.kernel.org, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org, patches@linaro.org Subject: Re: [RESEND PATCH 1/2] ARM: OMAP2+: nand: Make board_onenand_init() visible to board code Organization: Texas Instruments, Inc. References: <1333564586-3259-1-git-send-email-javier@dowhile0.org> <20120508231653.GP5088@atomide.com> <87zk99jort.fsf@ti.com> <20120515195835.GC17852@atomide.com> Date: Tue, 15 May 2012 13:13:16 -0700 In-Reply-To: <20120515195835.GC17852@atomide.com> (Tony Lindgren's message of "Tue, 15 May 2012 12:58:36 -0700") Message-ID: <873971jj8j.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmiVdn5EDvrkcu2vF2No3xftdbNNmUSlyfLgoxU0w2EkXt1ExWNLWAuWaU/EY8oe7C2Og6Z Tony Lindgren writes: [...] > That's already merged as 8259573b (ARM: OMAP2+: nand: Make board_onenand_init() > visible to board code) so we need to apply it as a fix. > > Can you do a fix with your Signed-off-by or at least reply with that > so I can apply it? Here you go. Applies to your 'board' branch. Kevin >From f4f2c35de0e67e3b8185059ffd78be67f7096d8a Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 15 May 2012 13:07:20 -0700 Subject: [PATCH] ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 8259573b (ARM: OMAP2+: nand: Make board_onenand_init() visible to board code) broke the build for configs with OneNAND disabled. By removing the static in the header file, it created a duplicate definition in the .c and the .h files, resuling in a build error: /work/kernel/omap/dev/arch/arm/mach-omap2/board-flash.c:102:111: error: redefinition of 'board_onenand_init' /work/kernel/omap/dev/arch/arm/mach-omap2/board-flash.h:56:51: note: previous definition of 'board_onenand_init' was here make[2]: *** [arch/arm/mach-omap2/board-flash.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/arm/mach-omap2] Error 2 make: *** [sub-make] Error 2 Fix this by removing the duplicate dummy entry from the C file. Cc: Enric Balletbò i Serra Cc: Javier Martinez Canillas Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/board-flash.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index 70a81f9..53c39d2 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c @@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, gpmc_onenand_init(&board_onenand_data); } -#else -void -__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) -{ -} #endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */ #if defined(CONFIG_MTD_NAND_OMAP2) || \