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 'sh-latest' of git://github.com/pmundt/linux-sh
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
hx4700.c
diff --git
a/arch/arm/mach-pxa/hx4700.c
b/arch/arm/mach-pxa/hx4700.c
index
c748a47
..
6f6368e
100644
(file)
--- a/
arch/arm/mach-pxa/hx4700.c
+++ b/
arch/arm/mach-pxa/hx4700.c
@@
-838,7
+838,7
@@
static void __init hx4700_init(void)
}
MACHINE_START(H4700, "HP iPAQ HX4700")
}
MACHINE_START(H4700, "HP iPAQ HX4700")
- .
boot_params = 0xa0000
100,
+ .
atag_offset = 0x
100,
.map_io = pxa27x_map_io,
.nr_irqs = HX4700_NR_IRQS,
.init_irq = pxa27x_init_irq,
.map_io = pxa27x_map_io,
.nr_irqs = HX4700_NR_IRQS,
.init_irq = pxa27x_init_irq,