summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2006-09-15 23:42:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-25 10:25:15 +0100
commit505788cccbb96cd496b646594c8a5fcdc26bc2d9 (patch)
tree9dbf59540c937cada2c5ae81e8459c50842374a3 /arch/arm/mach-s3c2410/Makefile
parentfd88edd20fb0e8e2729aa8ce565316242189ceea (diff)
downloadblackbird-op-linux-505788cccbb96cd496b646594c8a5fcdc26bc2d9.tar.gz
blackbird-op-linux-505788cccbb96cd496b646594c8a5fcdc26bc2d9.zip
[ARM] 3796/1: S3C24XX: Add per-cpu DMA channel mapper
Allow each CPU type in the S3C24XX range to select the DMA channel mapping it supports. We change the DMA registration to use an virtual channel number that the DMA system will allocate to a hardware channel at request time. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410/Makefile')
-rw-r--r--arch/arm/mach-s3c2410/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 0eadec916214..e4c32f6ffb71 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -9,6 +9,8 @@ obj-y := cpu.o irq.o time.o gpio.o clock.o devs.o
obj-m :=
obj-n :=
obj- :=
+obj-dma-y :=
+obj-dma-n :=
# DMA
obj-$(CONFIG_S3C2410_DMA) += dma.o
@@ -57,6 +59,10 @@ obj-$(CONFIG_CPU_S3C2442) += s3c2442-clock.o
obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o
+# merge in dma objects
+
+obj-y += $(obj-dma-y)
+
# machine specific support
obj-$(CONFIG_MACH_ANUBIS) += mach-anubis.o
OpenPOWER on IntegriCloud