diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:05:50 -0400 |
| commit | b0d44c0dbbd52effb731b1c0af9afd56215c48de (patch) | |
| tree | 3237c0087d91a5390aed05689b9f610ba16fa116 /arch/sh/include/asm/dma.h | |
| parent | 9537a48ed4b9e4b738943d6da0a0fd4278adf905 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'arch/sh/include/asm/dma.h')
| -rw-r--r-- | arch/sh/include/asm/dma.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/dma.h b/arch/sh/include/asm/dma.h index beca7128e2ab..6bd178473878 100644 --- a/arch/sh/include/asm/dma.h +++ b/arch/sh/include/asm/dma.h | |||
| @@ -25,9 +25,9 @@ | |||
| 25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET+0x10000000) | 25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET+0x10000000) |
| 26 | 26 | ||
| 27 | #ifdef CONFIG_NR_DMA_CHANNELS | 27 | #ifdef CONFIG_NR_DMA_CHANNELS |
| 28 | # define MAX_DMA_CHANNELS (CONFIG_NR_DMA_CHANNELS) | 28 | # define MAX_DMA_CHANNELS (CONFIG_NR_DMA_CHANNELS) |
| 29 | #else | 29 | #else |
| 30 | # define MAX_DMA_CHANNELS (CONFIG_NR_ONCHIP_DMA_CHANNELS) | 30 | # define MAX_DMA_CHANNELS (CONFIG_NR_ONCHIP_DMA_CHANNELS) |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | /* | 33 | /* |