From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH] ARM: omap4: Fix standalone OMAP4 build break Date: Mon, 25 Jun 2012 03:53:37 -0700 Message-ID: <20120625105336.GD12766@atomide.com> References: <1340365461-25385-1-git-send-email-rnayak@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:54283 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755339Ab2FYKxj (ORCPT ); Mon, 25 Jun 2012 06:53:39 -0400 Content-Disposition: inline In-Reply-To: <1340365461-25385-1-git-send-email-rnayak@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Rajendra Nayak Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org * Rajendra Nayak [120622 04:48]: > Fix the below build error while building OMAP4 standalone > > CC arch/arm/mach-omap2/board-flash.o > arch/arm/mach-omap2/board-flash.c:102: error: redefinition of 'board_onenand_init' > arch/arm/mach-omap2/board-flash.h:56: note: previous definition of 'board_onenand_init' was here > make[1]: *** [arch/arm/mach-omap2/board-flash.o] Error 1 > make: *** [arch/arm/mach-omap2] Error 2 > > Signed-off-by: Rajendra Nayak Thanks, applying into fixes with the updated description to describe the regression causing commit. Tony > --- > arch/arm/mach-omap2/board-flash.c | 5 ----- > 1 files changed, 0 insertions(+), 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) || \ > -- > 1.7.1 >