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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-clps711x
/
edb7211-arch.c
diff --git
a/arch/arm/mach-clps711x/edb7211-arch.c
b/arch/arm/mach-clps711x/edb7211-arch.c
index
725a7a5
..
9721f61
100644
(file)
--- a/
arch/arm/mach-clps711x/edb7211-arch.c
+++ b/
arch/arm/mach-clps711x/edb7211-arch.c
@@
-56,7
+56,7
@@
fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)
MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
/* Maintainer: Jon McClintock */
MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
/* Maintainer: Jon McClintock */
- .
boot_params = 0xc0020100,
/* 0xc0000000 - 0xc001ffff can be video RAM */
+ .
atag_offset = 0x20100,
/* 0xc0000000 - 0xc001ffff can be video RAM */
.fixup = fixup_edb7211,
.map_io = edb7211_map_io,
.reserve = edb7211_reserve,
.fixup = fixup_edb7211,
.map_io = edb7211_map_io,
.reserve = edb7211_reserve,