diff options
author | Russell King | 2011-07-23 00:09:07 +0200 |
---|---|---|
committer | Russell King | 2011-07-23 00:09:07 +0200 |
commit | 3ad55155b222f2a901405dea20ff7c68828ecd92 (patch) | |
tree | 53b24c981387b037084a333dc5ae23be8e82ef4a /arch/arm/mach-realview/realview_pbx.c | |
parent | Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci... (diff) | |
parent | ARM: Fix build errors caused by adding generic macros (diff) | |
download | kernel-qcow2-linux-3ad55155b222f2a901405dea20ff7c68828ecd92.tar.gz kernel-qcow2-linux-3ad55155b222f2a901405dea20ff7c68828ecd92.tar.xz kernel-qcow2-linux-3ad55155b222f2a901405dea20ff7c68828ecd92.zip |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/mach-realview/realview_pbx.c')
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index 92ace2cf2b2c..363b0ab56150 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c @@ -400,4 +400,7 @@ MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX") .init_irq = gic_init_irq, .timer = &realview_pbx_timer, .init_machine = realview_pbx_init, +#ifdef CONFIG_ZONE_DMA + .dma_zone_size = SZ_256M, +#endif MACHINE_END |