diff --git a/[refs] b/[refs] index aa457cb05363..5d56879822c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63a1423763c6c38eeeaf6dc8cee986514ab67aed +refs/heads/master: a020727b1628cb4d7b70733222253c7fa3ec6113 diff --git a/trunk/drivers/mtd/nand/cafe.c b/trunk/drivers/mtd/nand/cafe.c index 887040c6c2d6..35a868708e03 100644 --- a/trunk/drivers/mtd/nand/cafe.c +++ b/trunk/drivers/mtd/nand/cafe.c @@ -272,7 +272,8 @@ static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command, cpu_relax(); } writel(doneint, cafe->mmio + CAFE_NAND_IRQ); - cafe_dev_dbg(&cafe->pdev->dev, "Command %x completed after %d usec, irqs %x (%x)\n", command, 50000-c, irqs, readl(cafe->mmio + CAFE_NAND_IRQ)); + cafe_dev_dbg(&cafe->pdev->dev, "Command %x completed after %d usec, irqs %x (%x)\n", + command, 500000-c, irqs, readl(cafe->mmio + CAFE_NAND_IRQ)); }