diff --git a/[refs] b/[refs]
index b912fc616718..e5941792d028 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0870066d7e6c85bbe37741137e4c4731501a98e0
+refs/heads/master: 3b36013cf9cc1a1da93ad6bb8f6d3b0221f67e42
diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c
index 0c582ed98e43..70c92a527f6b 100644
--- a/trunk/drivers/mtd/nand/davinci_nand.c
+++ b/trunk/drivers/mtd/nand/davinci_nand.c
@@ -811,9 +811,6 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
 static int __exit nand_davinci_remove(struct platform_device *pdev)
 {
 	struct davinci_nand_info *info = platform_get_drvdata(pdev);
-	int status;
-
-	status = mtd_device_unregister(&info->mtd);
 
 	spin_lock_irq(&davinci_nand_lock);
 	if (info->chip.ecc.mode == NAND_ECC_HW_SYNDROME)