diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-flash.h')
| -rw-r--r-- | arch/arm/mach-omap2/board-flash.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-flash.h b/arch/arm/mach-omap2/board-flash.h index c44b70d52021..a3aa5fca4495 100644 --- a/arch/arm/mach-omap2/board-flash.h +++ b/arch/arm/mach-omap2/board-flash.h | |||
| @@ -40,12 +40,14 @@ static inline void board_flash_init(struct flash_partitions part[], | |||
| 40 | #if defined(CONFIG_MTD_NAND_OMAP2) || \ | 40 | #if defined(CONFIG_MTD_NAND_OMAP2) || \ |
| 41 | defined(CONFIG_MTD_NAND_OMAP2_MODULE) | 41 | defined(CONFIG_MTD_NAND_OMAP2_MODULE) |
| 42 | extern void board_nand_init(struct mtd_partition *nand_parts, | 42 | extern void board_nand_init(struct mtd_partition *nand_parts, |
| 43 | u8 nr_parts, u8 cs, int nand_type); | 43 | u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t); |
| 44 | extern struct gpmc_timings nand_default_timings[]; | ||
| 44 | #else | 45 | #else |
| 45 | static inline void board_nand_init(struct mtd_partition *nand_parts, | 46 | static inline void board_nand_init(struct mtd_partition *nand_parts, |
| 46 | u8 nr_parts, u8 cs, int nand_type) | 47 | u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t) |
| 47 | { | 48 | { |
| 48 | } | 49 | } |
| 50 | #define nand_default_timings NULL | ||
| 49 | #endif | 51 | #endif |
| 50 | 52 | ||
| 51 | #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ | 53 | #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ |