summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/include/mach/dma.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-17 08:49:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-17 08:49:25 +0100
commita3685f00652af83f12b63e3b4ef48f29581ba48b (patch)
tree18ec9eed3deabf3c6b9bec206765a4dd0d8cf9ec /arch/arm/mach-s3c2410/include/mach/dma.h
parentb12f3cbd7a9a869eae1eb108da02526b132ba80b (diff)
parent63b1f51b2405573d47bf5b9ab6e7cd5c697d3dcc (diff)
Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/dma.h')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/dma.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h
index 08ac5f96c01..cf68136cc66 100644
--- a/arch/arm/mach-s3c2410/include/mach/dma.h
+++ b/arch/arm/mach-s3c2410/include/mach/dma.h
@@ -54,7 +54,7 @@ enum dma_ch {
#define DMACH_LOW_LEVEL (1<<28) /* use this to specifiy hardware ch no */
/* we have 4 dma channels */
-#ifndef CONFIG_CPU_S3C2443
+#if !defined(CONFIG_CPU_S3C2443) && !defined(CONFIG_CPU_S3C2416)
#define S3C_DMA_CHANNELS (4)
#else
#define S3C_DMA_CHANNELS (6)