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 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[pandora-kernel.git]
/
arch
/
arm
/
mach-integrator
/
integrator_cp.c
diff --git
a/arch/arm/mach-integrator/integrator_cp.c
b/arch/arm/mach-integrator/integrator_cp.c
index
4eb03ab
..
5de49c3
100644
(file)
--- a/
arch/arm/mach-integrator/integrator_cp.c
+++ b/
arch/arm/mach-integrator/integrator_cp.c
@@
-492,7
+492,7
@@
static struct sys_timer cp_timer = {
MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.reserve = integrator_reserve,
.map_io = intcp_map_io,
.init_early = intcp_init_early,