diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/board-flash.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/nand.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index 53c39d239d6e..9ceec38610d5 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c | |||
| @@ -140,7 +140,6 @@ __init board_nand_init(struct mtd_partition *nand_parts, | |||
| 140 | board_nand_data.devsize = nand_type; | 140 | board_nand_data.devsize = nand_type; |
| 141 | 141 | ||
| 142 | board_nand_data.ecc_opt = OMAP_ECC_HAMMING_CODE_DEFAULT; | 142 | board_nand_data.ecc_opt = OMAP_ECC_HAMMING_CODE_DEFAULT; |
| 143 | board_nand_data.gpmc_irq = OMAP_GPMC_IRQ_BASE + cs; | ||
| 144 | gpmc_nand_init(&board_nand_data); | 143 | gpmc_nand_init(&board_nand_data); |
| 145 | } | 144 | } |
| 146 | #endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */ | 145 | #endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */ |
diff --git a/arch/arm/plat-omap/include/plat/nand.h b/arch/arm/plat-omap/include/plat/nand.h index 290cef5c1093..1a68c1e5fe53 100644 --- a/arch/arm/plat-omap/include/plat/nand.h +++ b/arch/arm/plat-omap/include/plat/nand.h | |||
| @@ -24,7 +24,6 @@ struct omap_nand_platform_data { | |||
| 24 | struct gpmc_timings *gpmc_t; | 24 | struct gpmc_timings *gpmc_t; |
| 25 | int nr_parts; | 25 | int nr_parts; |
| 26 | bool dev_ready; | 26 | bool dev_ready; |
| 27 | int gpmc_irq; | ||
| 28 | enum nand_io xfer_type; | 27 | enum nand_io xfer_type; |
| 29 | int devsize; | 28 | int devsize; |
| 30 | enum omap_ecc ecc_opt; | 29 | enum omap_ecc ecc_opt; |