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-spi' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
spi
/
spi_mpc8xxx.c
diff --git
a/drivers/spi/spi_mpc8xxx.c
b/drivers/spi/spi_mpc8xxx.c
index
e9390d7
..
1fb2a6e
100644
(file)
--- a/
drivers/spi/spi_mpc8xxx.c
+++ b/
drivers/spi/spi_mpc8xxx.c
@@
-1013,7
+1013,7
@@
mpc8xxx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq)
init_completion(&mpc8xxx_spi->done);
- mpc8xxx_spi->base = ioremap(mem->start,
mem->end - mem->start + 1
);
+ mpc8xxx_spi->base = ioremap(mem->start,
resource_size(mem)
);
if (mpc8xxx_spi->base == NULL) {
ret = -ENOMEM;
goto err_ioremap;