diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
| commit | 15a6affec4449b54afba15ab7edbad0cac2736d3 (patch) | |
| tree | f2fa815f74be0b56acd05e62113600a7113d48a9 /arch/m68k/include/asm/dma.h | |
| parent | cd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (diff) | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
Merge tag 'v3.10-rc1' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130518.0
Linux 3.10-rc1
Diffstat (limited to 'arch/m68k/include/asm/dma.h')
| -rw-r--r-- | arch/m68k/include/asm/dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/dma.h b/arch/m68k/include/asm/dma.h index 0ff3fc6a6d9a..429fe26e320c 100644 --- a/arch/m68k/include/asm/dma.h +++ b/arch/m68k/include/asm/dma.h @@ -39,7 +39,7 @@ #define MAX_M68K_DMA_CHANNELS 4 #elif defined(CONFIG_M5272) #define MAX_M68K_DMA_CHANNELS 1 -#elif defined(CONFIG_M532x) +#elif defined(CONFIG_M53xx) #define MAX_M68K_DMA_CHANNELS 0 #else #define MAX_M68K_DMA_CHANNELS 2 |