diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-09-22 10:00:11 -0600 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-09-22 10:00:11 -0600 |
commit | 5dbd6535d5bcb9d1899dd27d209ca651431df66b (patch) | |
tree | 137231cd0e8e01a30e4946625836d512db6830e7 /arch/arm/plat-omap/include/plat/nand.h | |
parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
parent | de6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff) |
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_cff3.7_odaf3.7
These fixes are needed to fix non-omap build breakage for
twl-core driver and to fix omap1_defconfig compile when
led driver changes and omap sparse IRQ changes are merged
together. Also fix warnings for omaps not using pinctrl
framework yet.
Diffstat (limited to 'arch/arm/plat-omap/include/plat/nand.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/nand.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/nand.h b/arch/arm/plat-omap/include/plat/nand.h index 67fc5060183e..1a68c1e5fe53 100644 --- a/arch/arm/plat-omap/include/plat/nand.h +++ b/arch/arm/plat-omap/include/plat/nand.h @@ -24,11 +24,10 @@ struct omap_nand_platform_data { struct gpmc_timings *gpmc_t; int nr_parts; bool dev_ready; - int gpmc_irq; enum nand_io xfer_type; - unsigned long phys_base; int devsize; enum omap_ecc ecc_opt; + struct gpmc_nand_regs reg; }; /* minimum size for IO mapping */ |