summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2010-05-31 18:37:15 +0200
committerGrant Likely <grant.likely@secretlab.ca>2010-06-02 13:45:07 -0600
commit14acbbf8bada18f19930d38ce33c3947b2c718e0 (patch)
tree8197cd746d60ada2420b50649228cf4ff64b5b38 /drivers/mtd
parentef7f2e831c3a563505c9bc5b16ef4bcae3cf4b53 (diff)
downloadop-kernel-dev-14acbbf8bada18f19930d38ce33c3947b2c718e0.zip
op-kernel-dev-14acbbf8bada18f19930d38ce33c3947b2c718e0.tar.gz
of/mtd/nand: mpc5121_nfc.c: Fix build failures
Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/mpc5121_nfc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 3d0867d..0a130dc 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/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,
},
};
OpenPOWER on IntegriCloud