summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/nand_imx.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:02:32 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:02:32 +0100
commit9749c2f16f61048a66a98a95b6a1e88d4f491cf0 (patch)
tree529b4a220e337e6450d810b88c49c08c32f65ed6 /drivers/mtd/nand/nand_imx.c
parent856f60dbd157126241cf9033514137849bb5ca22 (diff)
parent4104dd917388943f5b0ae87d1360738675c338b0 (diff)
downloadbarebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.gz
barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.xz
Merge branch 'for-next/mtd'
Conflicts: arch/arm/configs/at91sam9x5ek_defconfig
Diffstat (limited to 'drivers/mtd/nand/nand_imx.c')
-rw-r--r--drivers/mtd/nand/nand_imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c
index 7a207e3236..a56c65ff8c 100644
--- a/drivers/mtd/nand/nand_imx.c
+++ b/drivers/mtd/nand/nand_imx.c
@@ -1178,7 +1178,7 @@ static int __init imxnd_probe(struct device_d *dev)
this = &host->nand;
mtd = &host->mtd;
mtd->priv = this;
- mtd->dev = dev;
+ mtd->parent = dev;
/* 50 us command delay time */
this->chip_delay = 5;