summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/Makefile
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-02-09 19:20:47 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-11 16:54:32 +0000
commit4c784ef76ac4443ab13648859f1b2a2737546cc1 (patch)
tree0f31909ee6dc39b3970fae1e89ead6ad82d08cb2 /arch/arm/mach-s3c2410/Makefile
parentae0a846e411dc0b568e8ccda584896310ee5f369 (diff)
downloadblackbird-op-linux-4c784ef76ac4443ab13648859f1b2a2737546cc1.tar.gz
blackbird-op-linux-4c784ef76ac4443ab13648859f1b2a2737546cc1.zip
[ARM] 4155/1: S3C24XX: remove obj-dma-* from Makefile
In preperation for splitting the arch-s3c2410 directory up, remove the use of obj-dma-y in the Makefile and move to using CONFIG_S3C2440_DMA, CONFIG_S3C2412_DMA, etc. 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/Makefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 27663e28cc88..85ffa1274b0b 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -9,8 +9,6 @@ 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
@@ -37,9 +35,9 @@ obj-$(CONFIG_PM_H1940) += pm-h1940.o
obj-$(CONFIG_CPU_S3C2412) += s3c2412.o
obj-$(CONFIG_CPU_S3C2412) += s3c2412-irq.o
obj-$(CONFIG_CPU_S3C2412) += s3c2412-clock.o
-obj-dma-$(CONFIG_CPU_S3C2412) += s3c2412-dma.o
obj-$(CONFIG_S3C2412_PM) += s3c2412-pm.o
+obj-$(CONFIG_S3C2412_DMA) += s3c2412-dma.o
#
# S3C244X support
@@ -57,7 +55,7 @@ obj-$(CONFIG_CPU_S3C2440) += s3c2440.o s3c2440-dsc.o
obj-$(CONFIG_CPU_S3C2440) += s3c2440-irq.o
obj-$(CONFIG_CPU_S3C2440) += s3c2440-clock.o
obj-$(CONFIG_CPU_S3C2440) += s3c2410-gpio.o
-obj-dma-$(CONFIG_CPU_S3C2440) += s3c2440-dma.o
+obj-$(CONFIG_S3C2440_DMA) += s3c2440-dma.o
# S3C2442 support
@@ -68,10 +66,6 @@ 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_AML_M5900) += mach-amlm5900.o
OpenPOWER on IntegriCloud