summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-19 18:05:15 +0900
committerBen Dooks <ben-linux@fluff.org>2010-05-19 18:05:15 +0900
commit1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (patch)
tree5a6be34a53bf640c035d642b4d19388d6a7fd6cc /arch/arm/mach-s5pv210/Makefile
parent32457942b90aabb9242b450f02d18d9c8d982916 (diff)
parent7d1a2077a7e519fc0c68617526abea3f72632e60 (diff)
ARM: Merge for-2635/s5p-dma
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s5pv210/Makefile')
-rw-r--r--arch/arm/mach-s5pv210/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 0acbdb34b56..192deac8aaa 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -12,7 +12,7 @@ obj- :=
# Core support for S5PV210 system
-obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o gpiolib.o
+obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o dma.o gpiolib.o
# machine support