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-msm
/
board-trout.c
diff --git
a/arch/arm/mach-msm/board-trout.c
b/arch/arm/mach-msm/board-trout.c
index 7acd2021ada9edfe34c5ddd246b825e3ff5cba2f..6b9b227c87c59e25108d5570b72a0ebbe1227d66 100644
(file)
--- a/
arch/arm/mach-msm/board-trout.c
+++ b/
arch/arm/mach-msm/board-trout.c
@@
-93,7
+93,7
@@
static void __init trout_map_io(void)
}
MACHINE_START(TROUT, "HTC Dream")
- .
boot_params = 0x10000
100,
+ .
atag_offset = 0x
100,
.fixup = trout_fixup,
.map_io = trout_map_io,
.init_irq = trout_init_irq,
git.samba.org / sfrench / cifs-2.6.git / blobdiff