[PATCH] nand: Fix patch merge problem
Signed-off-by: Stefan Roese <sr@denx.de>
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 @@
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);