diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:07:18 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 11:07:18 -0700 |
| commit | 99f0b8d6b09b0db6452d0d6e252bfa28049bbea9 (patch) | |
| tree | 23db2359ad86957359da7c8a458e25eddb08d776 /arch/arm/mach-omap2/board-flash.h | |
| parent | 94c657853bd228ebbc2c590b7f81efcc1dde3329 (diff) | |
| parent | 94709014ea8d2f24fbc1e6eb6982e801e325bd47 (diff) | |
| download | olio-linux-3.10-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.tar.xz olio-linux-3.10-99f0b8d6b09b0db6452d0d6e252bfa28049bbea9.zip | |
Merge branch 'omap-for-v3.8/cleanup-headers-gpmc' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/pm34xx.c
drivers/mtd/nand/omap2.c
drivers/mtd/onenand/omap2.c
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) || \ |