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 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pasemi
/
dma_lib.c
diff --git
a/arch/powerpc/platforms/pasemi/dma_lib.c
b/arch/powerpc/platforms/pasemi/dma_lib.c
index
321a9b3
..
756123b
100644
(file)
--- a/
arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/
arch/powerpc/platforms/pasemi/dma_lib.c
@@
-576,7
+576,7
@@
int pasemi_dma_init(void)
res.start = 0xfd800000;
res.end = res.start + 0x1000;
}
- dma_status = __ioremap(res.start, res
.end-res.start
, 0);
+ dma_status = __ioremap(res.start, res
ource_size(&res)
, 0);
pci_dev_put(iob_pdev);
for (i = 0; i < MAX_TXCH; i++)