diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:20:30 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-30 00:21:47 -0500 |
| commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
| tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /drivers/dma/mpc512x_dma.c | |
| parent | e39d5ef678045d61812c1401f04fe8edb14d6359 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'drivers/dma/mpc512x_dma.c')
| -rw-r--r-- | drivers/dma/mpc512x_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 14a8c0f1698e..4e9cbf300594 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c | |||
| @@ -627,7 +627,7 @@ mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src, | |||
| 627 | return &mdesc->desc; | 627 | return &mdesc->desc; |
| 628 | } | 628 | } |
| 629 | 629 | ||
| 630 | static int __devinit mpc_dma_probe(struct of_device *op, | 630 | static int __devinit mpc_dma_probe(struct platform_device *op, |
| 631 | const struct of_device_id *match) | 631 | const struct of_device_id *match) |
| 632 | { | 632 | { |
| 633 | struct device_node *dn = op->dev.of_node; | 633 | struct device_node *dn = op->dev.of_node; |
| @@ -753,7 +753,7 @@ static int __devinit mpc_dma_probe(struct of_device *op, | |||
| 753 | return retval; | 753 | return retval; |
| 754 | } | 754 | } |
| 755 | 755 | ||
| 756 | static int __devexit mpc_dma_remove(struct of_device *op) | 756 | static int __devexit mpc_dma_remove(struct platform_device *op) |
| 757 | { | 757 | { |
| 758 | struct device *dev = &op->dev; | 758 | struct device *dev = &op->dev; |
| 759 | struct mpc_dma *mdma = dev_get_drvdata(dev); | 759 | struct mpc_dma *mdma = dev_get_drvdata(dev); |