From e7f3e9ff01fbd7fa72eb42a9675fbed6bc4736b0 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Tue, 28 Nov 2006 11:04:45 +0100 Subject: [PATCH] [PATCH] nand: Fix patch merge problem Signed-off-by: Stefan Roese --- drivers/nand/nand_base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nand/nand_base.c b/drivers/nand/nand_base.c index 2e3fcdf5ab..421550b151 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); -- 2.39.5