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 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
h3100.c
diff --git
a/arch/arm/mach-sa1100/h3100.c
b/arch/arm/mach-sa1100/h3100.c
index
03d7376
..
b30733a
100644
(file)
--- a/
arch/arm/mach-sa1100/h3100.c
+++ b/
arch/arm/mach-sa1100/h3100.c
@@
-84,7
+84,7
@@
static void __init h3100_mach_init(void)
}
MACHINE_START(H3100, "Compaq iPAQ H3100")
- .
boot_params = 0xc0000
100,
+ .
atag_offset = 0x
100,
.map_io = h3100_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,