summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-11-28 11:04:45 +0100
committerStefan Roese <sr@denx.de>2006-11-28 11:05:49 +0100
commite7f3e9ff01fbd7fa72eb42a9675fbed6bc4736b0 (patch)
tree71ef288055d446ec1ba4780e8c6bcdd9e5508169
parentd2c83f549378fb3fc34cb3c2e62fd772fbf8b68b (diff)
downloadu-boot-imx-e7f3e9ff01fbd7fa72eb42a9675fbed6bc4736b0.zip
u-boot-imx-e7f3e9ff01fbd7fa72eb42a9675fbed6bc4736b0.tar.gz
u-boot-imx-e7f3e9ff01fbd7fa72eb42a9675fbed6bc4736b0.tar.bz2
[PATCH] nand: Fix patch merge problem
Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--drivers/nand/nand_base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c
index 2e3fcdf..421550b 100644
--- a/drivers/nand/nand_base.c
+++ b/drivers/nand/nand_base.c
@@ -838,9 +838,9 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
unsigned long timeo;
if (state == FL_ERASING)
- timeo += (HZ * 400) / 1000;
+ timeo = (CFG_HZ * 400) / 1000;
else
- timeo += (HZ * 20) / 1000;
+ timeo = (CFG_HZ * 20) / 1000;
if ((state == FL_ERASING) && (this->options & NAND_IS_AND))
this->cmdfunc(mtd, NAND_CMD_STATUS_MULTI, -1, -1);