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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
nanoengine.c
diff --git
a/arch/arm/mach-sa1100/nanoengine.c
b/arch/arm/mach-sa1100/nanoengine.c
index
72087f0
..
032f388
100644
(file)
--- a/
arch/arm/mach-sa1100/nanoengine.c
+++ b/
arch/arm/mach-sa1100/nanoengine.c
@@
-111,7
+111,7
@@
static void __init nanoengine_init(void)
}
MACHINE_START(NANOENGINE, "BSE nanoEngine")
- .
boot_params = 0xc00000
00,
+ .
atag_offset = 0x1
00,
.map_io = nanoengine_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,