Skip to content

Commit

Permalink
of/mtd/nand: mpc5121_nfc.c: Fix build failures
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anatolij Gustschin authored and Grant Likely committed Jun 2, 2010
1 parent ef7f2e8 commit 14acbbf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/mtd/nand/mpc5121_nfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
},
};

Expand Down

0 comments on commit 14acbbf

Please sign in to comment.