diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-ixp4xx/goramo_mlr.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-ixp4xx/goramo_mlr.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/goramo_mlr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/goramo_mlr.c b/arch/arm/mach-ixp4xx/goramo_mlr.c index 7548d9a2efe..bf6678d1a92 100644 --- 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") | |||
| 499 | .map_io = ixp4xx_map_io, | 499 | .map_io = ixp4xx_map_io, |
| 500 | .init_irq = ixp4xx_init_irq, | 500 | .init_irq = ixp4xx_init_irq, |
| 501 | .timer = &ixp4xx_timer, | 501 | .timer = &ixp4xx_timer, |
| 502 | .boot_params = 0x0100, | 502 | .atag_offset = 0x100, |
| 503 | .init_machine = gmlr_init, | 503 | .init_machine = gmlr_init, |
| 504 | #if defined(CONFIG_PCI) | 504 | #if defined(CONFIG_PCI) |
| 505 | .dma_zone_size = SZ_64M, | 505 | .dma_zone_size = SZ_64M, |