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/steve/linux-dm
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
goramo_mlr.c
diff --git
a/arch/arm/mach-ixp4xx/goramo_mlr.c
b/arch/arm/mach-ixp4xx/goramo_mlr.c
index
7548d9a
..
bf6678d
100644
(file)
--- a/
arch/arm/mach-ixp4xx/goramo_mlr.c
+++ b/
arch/arm/mach-ixp4xx/goramo_mlr.c
@@
-499,7
+499,7
@@
MACHINE_START(GORAMO_MLR, "MultiLink")
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer,
- .
boot_params = 0x0
100,
+ .
atag_offset = 0x
100,
.init_machine = gmlr_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,