Message ID | 873971jj8j.fsf@ti.com |
---|---|
State | New |
Headers | show |
* Kevin Hilman <khilman@ti.com> [120515 13:17]: > Tony Lindgren <tony@atomide.com> 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. Thanks applying into fixes-board branch. Tony
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) || \