diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-18 18:00:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-18 18:00:42 -0400 |
| commit | 07f1c295de593ec0b0dca3092299c048c03374da (patch) | |
| tree | ad8f291e550b3315f84c07e9f543e25adcf95dc3 /arch/arm/kernel | |
| parent | 4aa96ccf9ee35cdbd0d423e87a4d551019570218 (diff) | |
| parent | fb89fcfb151698776be6c900aec8161b01990e92 (diff) | |
Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 7cc11c07add..f59653d6765 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
| @@ -918,6 +918,12 @@ void __init setup_arch(char **cmdline_p) | |||
| 918 | cpu_init(); | 918 | cpu_init(); |
| 919 | tcm_init(); | 919 | tcm_init(); |
| 920 | 920 | ||
| 921 | #ifdef CONFIG_ZONE_DMA | ||
| 922 | if (mdesc->dma_zone_size) { | ||
| 923 | extern unsigned long arm_dma_zone_size; | ||
| 924 | arm_dma_zone_size = mdesc->dma_zone_size; | ||
| 925 | } | ||
| 926 | #endif | ||
| 921 | #ifdef CONFIG_MULTI_IRQ_HANDLER | 927 | #ifdef CONFIG_MULTI_IRQ_HANDLER |
| 922 | handle_arch_irq = mdesc->handle_irq; | 928 | handle_arch_irq = mdesc->handle_irq; |
| 923 | #endif | 929 | #endif |