diff options
| author | Anatolij Gustschin <agust@denx.de> | 2010-05-31 18:39:13 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-06-02 13:45:08 -0600 |
| commit | b4a75c91b8a6cb80ba7772f69613025ddf75ebc2 (patch) | |
| tree | f2e20c6470b6c0e0c06ba923ceccfb5ef7032b88 /drivers/dma | |
| parent | 14acbbf8bada18f19930d38ce33c3947b2c718e0 (diff) | |
| download | lwn-b4a75c91b8a6cb80ba7772f69613025ddf75ebc2.tar.gz lwn-b4a75c91b8a6cb80ba7772f69613025ddf75ebc2.zip | |
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>
Diffstat (limited to 'drivers/dma')
| -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, static int __devinit mpc_dma_probe(struct of_device *op, const struct of_device_id *match) { - struct device_node *dn = op->node; + struct device_node *dn = op->dev.of_node; struct device *dev = &op->dev; struct dma_device *dma; struct mpc_dma *mdma; @@ -771,12 +771,12 @@ static struct of_device_id mpc_dma_match[] = { }; static struct of_platform_driver mpc_dma_driver = { - .match_table = mpc_dma_match, .probe = mpc_dma_probe, .remove = __devexit_p(mpc_dma_remove), - .driver = { - .name = DRV_NAME, - .owner = THIS_MODULE, + .driver = { + .name = DRV_NAME, + .owner = THIS_MODULE, + .of_match_table = mpc_dma_match, }, }; |