diff options
author | Anatolij Gustschin <agust@denx.de> | 2010-05-31 12:39:13 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-06-02 15:45:08 -0400 |
commit | b4a75c91b8a6cb80ba7772f69613025ddf75ebc2 (patch) | |
tree | f2e20c6470b6c0e0c06ba923ceccfb5ef7032b88 | |
parent | 14acbbf8bada18f19930d38ce33c3947b2c718e0 (diff) |
of/dma: mpc512x_dma.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>
-rw-r--r-- | drivers/dma/mpc512x_dma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 201e6e19c344..14a8c0f1698e 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c | |||
@@ -630,7 +630,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src, | |||
630 | static int __devinit mpc_dma_probe(struct of_device *op, | 630 | static int __devinit mpc_dma_probe(struct of_device *op, |
631 | const struct of_device_id *match) | 631 | const struct of_device_id *match) |
632 | { | 632 | { |
633 | struct device_node *dn = op->node; | 633 | struct device_node *dn = op->dev.of_node; |
634 | struct device *dev = &op->dev; | 634 | struct device *dev = &op->dev; |
635 | struct dma_device *dma; | 635 | struct dma_device *dma; |
636 | struct mpc_dma *mdma; | 636 | struct mpc_dma *mdma; |
@@ -771,12 +771,12 @@ static struct of_device_id mpc_dma_match[] = { | |||
771 | }; | 771 | }; |
772 | 772 | ||
773 | static struct of_platform_driver mpc_dma_driver = { | 773 | static struct of_platform_driver mpc_dma_driver = { |
774 | .match_table = mpc_dma_match, | ||
775 | .probe = mpc_dma_probe, | 774 | .probe = mpc_dma_probe, |
776 | .remove = __devexit_p(mpc_dma_remove), | 775 | .remove = __devexit_p(mpc_dma_remove), |
777 | .driver = { | 776 | .driver = { |
778 | .name = DRV_NAME, | 777 | .name = DRV_NAME, |
779 | .owner = THIS_MODULE, | 778 | .owner = THIS_MODULE, |
779 | .of_match_table = mpc_dma_match, | ||
780 | }, | 780 | }, |
781 | }; | 781 | }; |
782 | 782 | ||