diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-19 01:55:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-19 01:56:17 -0400 |
| commit | 68d2cf25d39324c54b5e42de7915c623a0917abe (patch) | |
| tree | ff1291450d7e6630bc77ec1363c3db8d74fa58b0 /arch/arm/plat-mxc/devices/platform-imxdi_rtc.c | |
| parent | 176fcc5c5f0131504a55e1e1d35389c49a9177c2 (diff) | |
| parent | 5d2cd90922c778908bd0cd669e572a5b5eafd737 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: we'll be queueing up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-imxdi_rtc.c')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-imxdi_rtc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-imxdi_rtc.c b/arch/arm/plat-mxc/devices/platform-imxdi_rtc.c index 10653cc8d1fa..805336fdc252 100644 --- a/arch/arm/plat-mxc/devices/platform-imxdi_rtc.c +++ b/arch/arm/plat-mxc/devices/platform-imxdi_rtc.c | |||
| @@ -27,7 +27,7 @@ struct platform_device *__init imx_add_imxdi_rtc( | |||
| 27 | struct resource res[] = { | 27 | struct resource res[] = { |
| 28 | { | 28 | { |
| 29 | .start = data->iobase, | 29 | .start = data->iobase, |
| 30 | .end = data->iobase + SZ_16K, | 30 | .end = data->iobase + SZ_16K - 1, |
| 31 | .flags = IORESOURCE_MEM, | 31 | .flags = IORESOURCE_MEM, |
| 32 | }, { | 32 | }, { |
| 33 | .start = data->irq, | 33 | .start = data->irq, |