summaryrefslogtreecommitdiffstats
path: root/drivers/memory
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-20 22:36:23 +0200
committerArnd Bergmann <arnd@arndb.de>2017-10-20 22:36:23 +0200
commitd5bd8507cf3f7fcb890b2c02bbfab26efac75795 (patch)
treeac3f9f70b55cb7f250ac8245d34e6a2fd8266c97 /drivers/memory
parent8a36c27d19bdd750832300c4327731b0792e2830 (diff)
parent0d96a4f6a03797b73bee465cada39133b7972e8d (diff)
downloadlinux-d5bd8507cf3f7fcb890b2c02bbfab26efac75795.tar.gz
linux-d5bd8507cf3f7fcb890b2c02bbfab26efac75795.tar.bz2
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 'drivers/memory')
-rw-r--r--drivers/memory/omap-gpmc.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 7059bbda2fac..f2aef0b87bc6 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -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 +