diff options
Diffstat (limited to 'arch')
-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- := | |||
13 | 13 | ||
14 | obj-y += init.o | 14 | obj-y += init.o |
15 | obj-y += time.o | 15 | obj-y += time.o |
16 | |||
17 | # DMA support | ||
18 | |||
19 | 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 | |||
39 | obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o | 39 | obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o |
40 | obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o | 40 | obj-$(CONFIG_S3C_DEV_NAND) += dev-nand.o |
41 | 41 | ||
42 | # DMA support | ||
43 | |||
44 | obj-$(CONFIG_S3C_DMA) += dma.o | ||
45 | |||
42 | # PM support | 46 | # PM support |
43 | 47 | ||
44 | obj-$(CONFIG_PM) += pm.o | 48 | 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 @@ | |||
1 | /* arch/arm/plat-s3c/include/plat/dma.h | 1 | /* arch/arm/plat-samsung/include/plat/dma.h |
2 | * | 2 | * |
3 | * Copyright (C) 2003-2006 Simtec Electronics | 3 | * Copyright (C) 2003-2006 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |