diff options
author | Anatolij Gustschin <agust@denx.de> | 2010-05-31 12:37:15 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-06-02 15:45:07 -0400 |
commit | 14acbbf8bada18f19930d38ce33c3947b2c718e0 (patch) | |
tree | 8197cd746d60ada2420b50649228cf4ff64b5b38 /drivers/mtd | |
parent | ef7f2e831c3a563505c9bc5b16ef4bcae3cf4b53 (diff) |
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.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 3d0867d829cb..0a130dcaa129 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) | |||
650 | static int __devinit mpc5121_nfc_probe(struct of_device *op, | 650 | static int __devinit mpc5121_nfc_probe(struct of_device *op, |
651 | const struct of_device_id *match) | 651 | const struct of_device_id *match) |
652 | { | 652 | { |
653 | struct device_node *rootnode, *dn = op->node; | 653 | struct device_node *rootnode, *dn = op->dev.of_node; |
654 | struct device *dev = &op->dev; | 654 | struct device *dev = &op->dev; |
655 | struct mpc5121_nfc_prv *prv; | 655 | struct mpc5121_nfc_prv *prv; |
656 | struct resource res; | 656 | struct resource res; |
@@ -889,12 +889,12 @@ static struct of_device_id mpc5121_nfc_match[] __devinitdata = { | |||
889 | }; | 889 | }; |
890 | 890 | ||
891 | static struct of_platform_driver mpc5121_nfc_driver = { | 891 | static struct of_platform_driver mpc5121_nfc_driver = { |
892 | .match_table = mpc5121_nfc_match, | ||
893 | .probe = mpc5121_nfc_probe, | 892 | .probe = mpc5121_nfc_probe, |
894 | .remove = __devexit_p(mpc5121_nfc_remove), | 893 | .remove = __devexit_p(mpc5121_nfc_remove), |
895 | .driver = { | 894 | .driver = { |
896 | .name = DRV_NAME, | 895 | .name = DRV_NAME, |
897 | .owner = THIS_MODULE, | 896 | .owner = THIS_MODULE, |
897 | .of_match_table = mpc5121_nfc_match, | ||
898 | }, | 898 | }, |
899 | }; | 899 | }; |
900 | 900 | ||