From e7e94f62b1581624ef1b024f7edb68f1dce8b6b7 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 9 May 2012 14:19:14 -0700 Subject: [PATCH] --- yaml --- r: 303451 b: refs/heads/master c: 8259573b322ee87d4aad26d4a3ecb737b94da272 h: refs/heads/master i: 303449: 9cdb01e09a9bd90049b5e542f5fc485c85cd324b 303447: ca89a747520abbb19d74243b5ccc6eb7b7796a5c v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-flash.c | 4 ++-- trunk/arch/arm/mach-omap2/board-flash.h | 11 +++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bad70ff5ee29..eb299832033a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d61676b8f079d39808559e67c48a518fd14411ec +refs/heads/master: 8259573b322ee87d4aad26d4a3ecb737b94da272 diff --git a/trunk/arch/arm/mach-omap2/board-flash.c b/trunk/arch/arm/mach-omap2/board-flash.c index 0349fd2b68d8..70a81f900bb5 100644 --- a/trunk/arch/arm/mach-omap2/board-flash.c +++ b/trunk/arch/arm/mach-omap2/board-flash.c @@ -87,7 +87,7 @@ static struct omap_onenand_platform_data board_onenand_data = { .dma_channel = -1, /* disable DMA in OMAP OneNAND driver */ }; -static void +void __init board_onenand_init(struct mtd_partition *onenand_parts, u8 nr_parts, u8 cs) { @@ -98,7 +98,7 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, gpmc_onenand_init(&board_onenand_data); } #else -static void +void __init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) { } diff --git a/trunk/arch/arm/mach-omap2/board-flash.h b/trunk/arch/arm/mach-omap2/board-flash.h index d25503a98417..c44b70d52021 100644 --- a/trunk/arch/arm/mach-omap2/board-flash.h +++ b/trunk/arch/arm/mach-omap2/board-flash.h @@ -47,3 +47,14 @@ static inline void board_nand_init(struct mtd_partition *nand_parts, { } #endif + +#if defined(CONFIG_MTD_ONENAND_OMAP2) || \ + defined(CONFIG_MTD_ONENAND_OMAP2_MODULE) +extern void board_onenand_init(struct mtd_partition *nand_parts, + u8 nr_parts, u8 cs); +#else +static inline void board_onenand_init(struct mtd_partition *nand_parts, + u8 nr_parts, u8 cs) +{ +} +#endif