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 'depends/rmk/devel-stable' into imx/imx6q
[pandora-kernel.git]
/
arch
/
arm
/
mach-integrator
/
integrator_ap.c
diff --git
a/arch/arm/mach-integrator/integrator_ap.c
b/arch/arm/mach-integrator/integrator_ap.c
index
8cdc730
..
a20fb3f
100644
(file)
--- a/
arch/arm/mach-integrator/integrator_ap.c
+++ b/
arch/arm/mach-integrator/integrator_ap.c
@@
-459,7
+459,7
@@
static struct sys_timer ap_timer = {
MACHINE_START(INTEGRATOR, "ARM-Integrator")
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.reserve = integrator_reserve,
.map_io = ap_map_io,
.init_early = integrator_init_early,