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
This commit is contained in:
Arnd Bergmann
2017-10-20 22:36:23 +02:00
2 changed files with 0 additions and 3 deletions

View File

@@ -1079,7 +1079,6 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs)
{
int i;
reg->gpmc_status = NULL; /* deprecated */
reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET +
GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs;
reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET +