---

yaml --- r: 36565 b: refs/heads/master c: 505788c h: refs/heads/master i: 36563: ecbc46a v: v3
git-mirror · Sep 25, 2006 · 3e8c824 · 3e8c824
1 parent 460fd0e
commit 3e8c824
Show file tree

Hide file tree

Showing 5 changed files with 258 additions and 70 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd88edd20fb0e8e2729aa8ce565316242189ceea
+refs/heads/master: 505788cccbb96cd496b646594c8a5fcdc26bc2d9
diff --git a/trunk/arch/arm/mach-s3c2410/Makefile b/trunk/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