git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-mxc
/
devices
/
platform-mxc-mmc.c
diff --git
a/arch/arm/plat-mxc/devices/platform-mxc-mmc.c
b/arch/arm/plat-mxc/devices/platform-mxc-mmc.c
index 540d3a7d92dfaacf8fd82cbd745327c7d2e094a9..e7b920b58675d79bab4b1ef598b18e0f05fb14ed 100644
(file)
--- a/
arch/arm/plat-mxc/devices/platform-mxc-mmc.c
+++ b/
arch/arm/plat-mxc/devices/platform-mxc-mmc.c
@@
-55,7
+55,7
@@
struct platform_device *__init imx_add_mxc_mmc(
struct resource res[] = {
{
.start = data->iobase,
- .end = data->iobase +
SZ_4K
- 1,
+ .end = data->iobase +
data->iosize
- 1,
.flags = IORESOURCE_MEM,
}, {
.start = data->irq,