diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-29 09:02:15 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-23 00:03:43 +0000 |
| commit | 2c420fe22f3d526691773288807d010068ce3033 (patch) | |
| tree | 8e2605d8ec4cc6f076d7a04f2aa9e3e2727d976d | |
| parent | 806c17b5497f62faa65a1fdd235b7fa2df17d704 (diff) | |
| download | talos-obmc-linux-2c420fe22f3d526691773288807d010068ce3033.tar.gz talos-obmc-linux-2c420fe22f3d526691773288807d010068ce3033.zip | |
ARM: SAMSUNG: Move DMA support to plat-samsung
Move the core of the DMA support to plat-samsung for everyone to use.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/plat-s3c/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/dma.c (renamed from arch/arm/plat-s3c/dma.c) | 0 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/dma.h (renamed from arch/arm/plat-s3c/include/plat/dma.h) | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 197b9bd139ac..2a3c4a49117a 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/arch/arm/plat-s3c/Makefile @@ -13,7 +13,3 @@ obj- := obj-y += init.o obj-y += time.o - -# DMA support - -obj-$(CONFIG_S3C_DMA) += dma.o diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 629fd9f92a24..facc7e387fc5 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -39,6 +39,10 @@ obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o +# DMA support + +obj-$(CONFIG_S3C_DMA) += dma.o + # PM support obj-$(CONFIG_PM) += pm.o diff --git a/arch/arm/plat-s3c/dma.c b/arch/arm/plat-samsung/dma.c index 606db1af5fe7..606db1af5fe7 100644 --- a/arch/arm/plat-s3c/dma.c +++ b/arch/arm/plat-samsung/dma.c diff --git a/arch/arm/plat-s3c/include/plat/dma.h b/arch/arm/plat-samsung/include/plat/dma.h index e429d10be3ad..7584d751ed51 100644 --- a/arch/arm/plat-s3c/include/plat/dma.h +++ b/arch/arm/plat-samsung/include/plat/dma.h @@ -1,4 +1,4 @@ -/* arch/arm/plat-s3c/include/plat/dma.h +/* arch/arm/plat-samsung/include/plat/dma.h * * Copyright (C) 2003-2006 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> |
