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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
gpmc.c
diff --git
a/arch/arm/mach-omap2/gpmc.c
b/arch/arm/mach-omap2/gpmc.c
index e86f5ca180ea7981f38018889a6a222701353fdf..bd8cb5974726bb670da33dd078965eb49ef96471 100644
(file)
--- a/
arch/arm/mach-omap2/gpmc.c
+++ b/
arch/arm/mach-omap2/gpmc.c
@@
-517,7
+517,7
@@
void __init gpmc_init(void)
ck = "gpmc_fck";
l = OMAP34XX_GPMC_BASE;
} else if (cpu_is_omap44xx()) {
- ck = "gpmc_
f
ck";
+ ck = "gpmc_ck";
l = OMAP44XX_GPMC_BASE;
}