From cc61ea81a58c16612ef280d6be9f538c737d8d2f Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 4 Apr 2009 15:27:45 +0100
Subject: [PATCH] --- yaml --- r: 142332 b: refs/heads/master c:
 c451c7c4c9c4f59c7808a7d397d32bef160c14d9 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/nand/cafe_nand.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb00b5b9f8fd..a539441e44c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87f39f0493edf7051b1b87c6e9eb7f9a74be8e85
+refs/heads/master: c451c7c4c9c4f59c7808a7d397d32bef160c14d9
diff --git a/trunk/drivers/mtd/nand/cafe_nand.c b/trunk/drivers/mtd/nand/cafe_nand.c
index 22a6b2e50e91..7c5b257ce8e4 100644
--- a/trunk/drivers/mtd/nand/cafe_nand.c
+++ b/trunk/drivers/mtd/nand/cafe_nand.c
@@ -654,6 +654,7 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
 	}
 	cafe = (void *)(&mtd[1]);
 
+	mtd->dev.parent = &pdev->dev;
 	mtd->priv = cafe;
 	mtd->owner = THIS_MODULE;