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 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...
[pandora-kernel.git]
/
arch
/
arm
/
common
/
scoop.c
diff --git
a/arch/arm/common/scoop.c
b/arch/arm/common/scoop.c
index
c11af1e
..
a07b0e7
100644
(file)
--- a/
arch/arm/common/scoop.c
+++ b/
arch/arm/common/scoop.c
@@
-193,7
+193,7
@@
static int __devinit scoop_probe(struct platform_device *pdev)
spin_lock_init(&devptr->scoop_lock);
inf = pdev->dev.platform_data;
- devptr->base = ioremap(mem->start,
mem->end - mem->start + 1
);
+ devptr->base = ioremap(mem->start,
resource_size(mem)
);
if (!devptr->base) {
ret = -ENOMEM;