diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-23 16:07:34 +0200 |
| commit | 1240e6b5532358257c52351639a8d2382fe58f84 (patch) | |
| tree | 43d374ce976a41c6dcd12a70a51e0289093f8d07 /drivers/mtd/nand/mpc5121_nfc.c | |
| parent | c9ff921abecda352e987a6aae169118a3fc9aa5d (diff) | |
| parent | a5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff) | |
| download | op-kernel-dev-1240e6b5532358257c52351639a8d2382fe58f84.zip op-kernel-dev-1240e6b5532358257c52351639a8d2382fe58f84.tar.gz | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/mtd/nand/mpc5121_nfc.c')
| -rw-r--r-- | drivers/mtd/nand/mpc5121_nfc.c | 8 |
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, }, }; |
