Merge git://git.infradead.org/users/dwmw2/random-2.6

[linux-2.6] / drivers / mtd / nand / orion_nand.c

diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index ec5ad28b237ef338859b072157b7a24f00b32507..ee2ac3948cd80b889332f004e5532cfaec4263ea 100644 (file)
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -85,6 +85,9 @@ static int __init orion_nand_probe(struct platform_device *pdev)
        nc->cmd_ctrl = orion_nand_cmd_ctrl;
        nc->ecc.mode = NAND_ECC_SOFT;
 
+       if (board->chip_delay)
+               nc->chip_delay = board->chip_delay;
+
        if (board->width == 16)
                nc->options |= NAND_BUSWIDTH_16;
 
@@ -169,3 +172,4 @@ module_exit(orion_nand_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Tzachi Perelstein");
 MODULE_DESCRIPTION("NAND glue for Orion platforms");
+MODULE_ALIAS("platform:orion_nand");