---

yaml --- r: 187670 b: refs/heads/master c: 2c420fe h: refs/heads/master v: v3
git-mirror · Feb 23, 2010 · fd2e97f · fd2e97f
1 parent c6afb6c
commit fd2e97f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 → trunk/arch/arm/plat-samsung/dma.c b/trunk/arch/arm/plat-s3c/dma.c → trunk/arch/arm/plat-samsung/dma.c
diff --git a/trunk/arch/arm/plat-s3c/include/plat/dma.h → .../arch/arm/plat-samsung/include/plat/dma.h b/trunk/arch/arm/plat-s3c/include/plat/dma.h → .../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>