projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'depends/rmk/memory_h' into next/fixes
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-pxa
/
zeus.c
diff --git
a/arch/arm/mach-pxa/zeus.c
b/arch/arm/mach-pxa/zeus.c
index 9188492fec2fd4fdebc035a141512909570b5f2c..498b83b089f32034b7d3ba8c0cfcb6aa9bcade69 100644
(file)
--- a/
arch/arm/mach-pxa/zeus.c
+++ b/
arch/arm/mach-pxa/zeus.c
@@
-904,7
+904,7
@@
static void __init zeus_map_io(void)
MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS")
/* Maintainer: Marc Zyngier <maz@misterjones.org> */
- .
boot_params = 0xa0000
100,
+ .
atag_offset = 0x
100,
.map_io = zeus_map_io,
.nr_irqs = ZEUS_NR_IRQS,
.init_irq = zeus_init_irq,