Merge remote-tracking branch 'xen-tip/linux-next'

[deliverable/linux.git] / drivers / mtd / nand / bf5xx_nand.c

diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 37da4236ab908099217184bd310a567365396192..3962f55bd03492aef64b235f596c921cb8fe8681 100644 (file)
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -761,8 +761,7 @@ static int bf5xx_nand_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, info);
 
-       spin_lock_init(&info->controller.lock);
-       init_waitqueue_head(&info->controller.wq);
+       nand_hw_control_init(&info->controller);
 
        info->device     = &pdev->dev;
        info->platform   = plat;