* [PATCH] ARM: omap4: Fix standalone OMAP4 build break
@ 2012-06-22 11:44 Rajendra Nayak
2012-06-25 10:53 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Rajendra Nayak @ 2012-06-22 11:44 UTC (permalink / raw)
To: linux-arm-kernel
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 <rnayak@ti.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] ARM: omap4: Fix standalone OMAP4 build break
2012-06-22 11:44 [PATCH] ARM: omap4: Fix standalone OMAP4 build break Rajendra Nayak
@ 2012-06-25 10:53 ` Tony Lindgren
2012-06-26 10:28 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Tony Lindgren @ 2012-06-25 10:53 UTC (permalink / raw)
To: linux-arm-kernel
* Rajendra Nayak <rnayak@ti.com> [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 <rnayak@ti.com>
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] ARM: omap4: Fix standalone OMAP4 build break
2012-06-25 10:53 ` Tony Lindgren
@ 2012-06-26 10:28 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2012-06-26 10:28 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120625 03:58]:
> * Rajendra Nayak <rnayak@ti.com> [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 <rnayak@ti.com>
>
> Thanks, applying into fixes with the updated description to describe
> the regression causing commit.
Oops, looks like I have an earlier fix already in fixes-board branch
from Kevin that I'll use instead.
Regards,
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-26 10:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-22 11:44 [PATCH] ARM: omap4: Fix standalone OMAP4 build break Rajendra Nayak
2012-06-25 10:53 ` Tony Lindgren
2012-06-26 10:28 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).