diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-19 00:00:42 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-19 00:00:42 +0200 |
| commit | 07f1c295de593ec0b0dca3092299c048c03374da (patch) | |
| tree | ad8f291e550b3315f84c07e9f543e25adcf95dc3 /arch/arm/mach-ixp4xx/gateway7001-setup.c | |
| parent | Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable (diff) | |
| parent | ARM: ARM_DMA_ZONE_SIZE is no more (diff) | |
| download | linux-07f1c295de593ec0b0dca3092299c048c03374da.tar.xz linux-07f1c295de593ec0b0dca3092299c048c03374da.zip | |
Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-ixp4xx/gateway7001-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/gateway7001-setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/gateway7001-setup.c b/arch/arm/mach-ixp4xx/gateway7001-setup.c index 9dc0b4eaa65a..d4f851bdd9a4 100644 --- a/arch/arm/mach-ixp4xx/gateway7001-setup.c +++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c @@ -101,5 +101,8 @@ MACHINE_START(GATEWAY7001, "Gateway 7001 AP") .timer = &ixp4xx_timer, .boot_params = 0x0100, .init_machine = gateway7001_init, +#if defined(CONFIG_PCI) + .dma_zone_size = SZ_64M, +#endif MACHINE_END #endif |