git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[pandora-kernel.git]
/
drivers
/
dma
/
mv_xor.c
diff --git
a/drivers/dma/mv_xor.c
b/drivers/dma/mv_xor.c
index
06f9f27
..
9a353c2
100644
(file)
--- a/
drivers/dma/mv_xor.c
+++ b/
drivers/dma/mv_xor.c
@@
-1304,7
+1304,8
@@
static int mv_xor_shared_probe(struct platform_device *pdev)
if (!res)
return -ENODEV;
- msp->xor_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
+ msp->xor_base = devm_ioremap(&pdev->dev, res->start,
+ resource_size(res));
if (!msp->xor_base)
return -EBUSY;