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 git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
arm
/
mach-versatile
/
core.c
diff --git
a/arch/arm/mach-versatile/core.c
b/arch/arm/mach-versatile/core.c
index
eb7ffa0
..
96e59e3
100644
(file)
--- 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 cha
r_
lcd_resources[] = {
+static struct resource chalcd_resources[] = {
{
.start = VERSATILE_CHAR_LCD_BASE,
.end = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1),