diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 23:09:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 23:09:07 +0100 |
| commit | 3ad55155b222f2a901405dea20ff7c68828ecd92 (patch) | |
| tree | 53b24c981387b037084a333dc5ae23be8e82ef4a /arch/arm/mach-ixp4xx/goramo_mlr.c | |
| parent | 06f365acef5ca54fd5708a0d853c4a89609536f1 (diff) | |
| parent | 6645cb61f3a1186a71475385d33f875dd8fb38bf (diff) | |
| download | op-kernel-dev-3ad55155b222f2a901405dea20ff7c68828ecd92.zip op-kernel-dev-3ad55155b222f2a901405dea20ff7c68828ecd92.tar.gz | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/mach-ixp4xx/goramo_mlr.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/goramo_mlr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/goramo_mlr.c b/arch/arm/mach-ixp4xx/goramo_mlr.c index 3e8c0e3..5f00ad2 100644 --- a/arch/arm/mach-ixp4xx/goramo_mlr.c +++ b/arch/arm/mach-ixp4xx/goramo_mlr.c @@ -501,4 +501,7 @@ MACHINE_START(GORAMO_MLR, "MultiLink") .timer = &ixp4xx_timer, .boot_params = 0x0100, .init_machine = gmlr_init, +#if defined(CONFIG_PCI) + .dma_zone_size = SZ_64M, +#endif MACHINE_END |
