diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 16:51:06 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 16:51:06 +0100 |
| commit | 66267ee58732bb4c21c7bbba004ee481b8ad2b30 (patch) | |
| tree | bf7f72e623d7c1ca6472e0a1286e802cd3bff139 /arch/arm/mach-imx/devices/platform-mxc-mmc.c | |
| parent | ARM: pxa: use module_platform_driver macro (diff) | |
| parent | zynq: move static peripheral mappings (diff) | |
| download | linux-66267ee58732bb4c21c7bbba004ee481b8ad2b30.tar.xz linux-66267ee58732bb4c21c7bbba004ee481b8ad2b30.zip | |
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
From Michal Simek:
* 'arm-next' of git://git.xilinx.com/linux-xlnx:
zynq: move static peripheral mappings
zynq: remove use of CLKDEV_LOOKUP
zynq: use pl310 device tree bindings
zynq: use GIC device tree bindings
+ Linux 3.7-rc3
Diffstat (limited to 'arch/arm/mach-imx/devices/platform-mxc-mmc.c')
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-mxc-mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/devices/platform-mxc-mmc.c b/arch/arm/mach-imx/devices/platform-mxc-mmc.c index 7da19afa1bba..b8203c760c8f 100644 --- a/arch/arm/mach-imx/devices/platform-mxc-mmc.c +++ b/arch/arm/mach-imx/devices/platform-mxc-mmc.c @@ -57,7 +57,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, |