diff --git a/[refs] b/[refs] index c859ed49ed8f..a7dbc68ee267 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 806c17b5497f62faa65a1fdd235b7fa2df17d704 +refs/heads/master: 2c420fe22f3d526691773288807d010068ce3033 diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile index 197b9bd139ac..2a3c4a49117a 100644 --- a/trunk/arch/arm/plat-s3c/Makefile +++ b/trunk/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/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile index 629fd9f92a24..facc7e387fc5 100644 --- a/trunk/arch/arm/plat-samsung/Makefile +++ b/trunk/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/trunk/arch/arm/plat-s3c/dma.c b/trunk/arch/arm/plat-samsung/dma.c similarity index 100% rename from trunk/arch/arm/plat-s3c/dma.c rename to trunk/arch/arm/plat-samsung/dma.c diff --git a/trunk/arch/arm/plat-s3c/include/plat/dma.h b/trunk/arch/arm/plat-samsung/include/plat/dma.h similarity index 98% rename from trunk/arch/arm/plat-s3c/include/plat/dma.h rename to trunk/arch/arm/plat-samsung/include/plat/dma.h index e429d10be3ad..7584d751ed51 100644 --- a/trunk/arch/arm/plat-s3c/include/plat/dma.h +++ b/trunk/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