From 903fc46f2c70af7f4265ce86fd3e3ed5af740f28 Mon Sep 17 00:00:00 2001
From: Anatolij Gustschin <agust@denx.de>
Date: Mon, 31 May 2010 18:37:15 +0200
Subject: [PATCH] --- yaml --- r: 199647 b: refs/heads/master c:
 14acbbf8bada18f19930d38ce33c3947b2c718e0 h: refs/heads/master i:   199645:
 5974f3643ad858fc96bec229f8541be421b0d370   199643:
 cfdcf139a3de143342e853af8a3d9c61fdee7d19   199639:
 3986162d5a177a6bf2b6e754692bceb1fdbd025f   199631:
 da50a0bd4297aa4f0d7d29d31a0456d4a2520542   199615:
 a6f8e6f90f15d6935ea5d90485f5ab2c1997ac5c v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/mtd/nand/mpc5121_nfc.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9a5fb5db3119..441300d954e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef7f2e831c3a563505c9bc5b16ef4bcae3cf4b53
+refs/heads/master: 14acbbf8bada18f19930d38ce33c3947b2c718e0
diff --git a/trunk/drivers/mtd/nand/mpc5121_nfc.c b/trunk/drivers/mtd/nand/mpc5121_nfc.c
index 3d0867d829cb..0a130dcaa129 100644
--- a/trunk/drivers/mtd/nand/mpc5121_nfc.c
+++ b/trunk/drivers/mtd/nand/mpc5121_nfc.c
@@ -650,7 +650,7 @@ static void mpc5121_nfc_free(struct device *dev, struct mtd_info *mtd)
 static int __devinit mpc5121_nfc_probe(struct of_device *op,
 					const struct of_device_id *match)
 {
-	struct device_node *rootnode, *dn = op->node;
+	struct device_node *rootnode, *dn = op->dev.of_node;
 	struct device *dev = &op->dev;
 	struct mpc5121_nfc_prv *prv;
 	struct resource res;
@@ -889,12 +889,12 @@ static struct of_device_id mpc5121_nfc_match[] __devinitdata = {
 };
 
 static struct of_platform_driver mpc5121_nfc_driver = {
-	.match_table	= mpc5121_nfc_match,
 	.probe		= mpc5121_nfc_probe,
 	.remove		= __devexit_p(mpc5121_nfc_remove),
 	.driver		= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
+		.name = DRV_NAME,
+		.owner = THIS_MODULE,
+		.of_match_table = mpc5121_nfc_match,
 	},
 };