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 branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-clps711x
/
clep7312.c
diff --git
a/arch/arm/mach-clps711x/clep7312.c
b/arch/arm/mach-clps711x/clep7312.c
index 0a2e74feb24af9f281a937de1be559f942e7dcc2..80496c09ac59efd63746560cf17a994dde5bfaec 100644
(file)
--- a/
arch/arm/mach-clps711x/clep7312.c
+++ b/
arch/arm/mach-clps711x/clep7312.c
@@
-36,7
+36,7
@@
fixup_clep7312(struct tag *tags, char **cmdline, struct meminfo *mi)
MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
/* Maintainer: Nobody */
- .
boot_params = 0xc000
0100,
+ .
atag_offset = 0x
0100,
.fixup = fixup_clep7312,
.map_io = clps711x_map_io,
.init_irq = clps711x_init_irq,