diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-30 09:07:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-30 09:07:43 +0200 |
| commit | 9f644c4ba86b76159d36747fda7da496f72a1872 (patch) | |
| tree | 31e025a5f283aff691fb636bf07fd0b445cf07a3 /arch/arm/mach-versatile | |
| parent | 1b7155f7de119870f0d3fad89f125de2ff6c16be (diff) | |
| parent | 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff) | |
| download | op-kernel-dev-9f644c4ba86b76159d36747fda7da496f72a1872.zip op-kernel-dev-9f644c4ba86b76159d36747fda7da496f72a1872.tar.gz | |
Merge commit 'v2.6.39-rc1' into perf/urgent
Merge reason: use the post-merge-window tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-versatile')
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index eb7ffa0..96e59e3 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -314,7 +314,7 @@ static struct mmci_platform_data mmc0_plat_data = { .gpio_cd = -1, }; -static struct resource char_lcd_resources[] = { +static struct resource chalcd_resources[] = { { .start = VERSATILE_CHAR_LCD_BASE, .end = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1), |
