diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-16 14:54:19 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-16 14:54:19 -0700 |
| commit | 94709014ea8d2f24fbc1e6eb6982e801e325bd47 (patch) | |
| tree | a99f2f7184d414d44fccb648a71565cab2c670b3 /arch/arm/mach-omap2/board-flash.h | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| parent | 3ef5d0071cf6c8b9a00b559232bb700ad59999d7 (diff) | |
| download | olio-linux-3.10-94709014ea8d2f24fbc1e6eb6982e801e325bd47.tar.xz olio-linux-3.10-94709014ea8d2f24fbc1e6eb6982e801e325bd47.zip | |
Merge tag 'gpmc-czimage' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/cleanup-headers-gpmc
gpmc cleanup for common ARM zImage
Diffstat (limited to 'arch/arm/mach-omap2/board-flash.h')
| -rw-r--r-- | arch/arm/mach-omap2/board-flash.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-flash.h b/arch/arm/mach-omap2/board-flash.h index c44b70d5202..2fb5d41a9fa 100644 --- a/arch/arm/mach-omap2/board-flash.h +++ b/arch/arm/mach-omap2/board-flash.h @@ -12,7 +12,7 @@ */ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> -#include <plat/gpmc.h> +#include "gpmc.h" #define PDC_NOR 1 #define PDC_NAND 2 @@ -40,12 +40,14 @@ static inline void board_flash_init(struct flash_partitions part[], #if defined(CONFIG_MTD_NAND_OMAP2) || \ defined(CONFIG_MTD_NAND_OMAP2_MODULE) extern void board_nand_init(struct mtd_partition *nand_parts, - u8 nr_parts, u8 cs, int nand_type); + u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t); +extern struct gpmc_timings nand_default_timings[]; #else static inline void board_nand_init(struct mtd_partition *nand_parts, - u8 nr_parts, u8 cs, int nand_type) + u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t) { } +#define nand_default_timings NULL #endif #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ |