diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:36:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:36:23 +0200 |
| commit | d5bd8507cf3f7fcb890b2c02bbfab26efac75795 (patch) | |
| tree | ac3f9f70b55cb7f250ac8245d34e6a2fd8266c97 /include/linux | |
| parent | 8a36c27d19bdd750832300c4327731b0792e2830 (diff) | |
| parent | 0d96a4f6a03797b73bee465cada39133b7972e8d (diff) | |
| download | cachepc-linux-d5bd8507cf3f7fcb890b2c02bbfab26efac75795.tar.gz cachepc-linux-d5bd8507cf3f7fcb890b2c02bbfab26efac75795.zip | |
Merge tag 'gpmc-omap-for-v4.15' of https://github.com/rogerq/linux into next/drivers
Pull "OMAP-GPMC: driver updates for v4.15" from Roger Quadros:
* get rid of unused field in platform data structure.
* tag 'gpmc-omap-for-v4.15' of https://github.com/rogerq/linux:
memory: omap-gpmc: Drop gpmc_status
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/mtd-nand-omap2.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h index 17d57a18bac5..25e267f1970c 100644 --- a/include/linux/platform_data/mtd-nand-omap2.h +++ b/include/linux/platform_data/mtd-nand-omap2.h @@ -63,8 +63,6 @@ struct gpmc_nand_regs { void __iomem *gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER]; void __iomem *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER]; void __iomem *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER]; - /* Deprecated. Do not use */ - void __iomem *gpmc_status; }; struct omap_nand_platform_data { |