---

yaml --- r: 187671 b: refs/heads/master c: 6c6971d h: refs/heads/master i: 187669: c6afb6c 187667: 5c74626 187663: 877e3eb v: v3
git-mirror · Feb 23, 2010 · b1b837f · b1b837f
1 parent fd2e97f
commit b1b837f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c420fe22f3d526691773288807d010068ce3033
+refs/heads/master: 6c6971dc4e8c23bb61bf309898e1693f9c5c8c24
diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile
@@ -6,10 +6,8 @@
 
 obj-y				:=
 obj-m				:=
-obj-n				:=
+obj-n				:= dummy.o
 obj-				:=
 
 # Core support for all Samsung SoCs
 
-obj-y				+= init.o
-obj-y				+= time.o
diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile
@@ -11,6 +11,8 @@ obj-				:=
 
 # Objects we always build independent of SoC choice
 
+obj-y				+= init.o
+obj-y				+= time.o
 obj-y				+= clock.o
 obj-y				+= pwm-clock.o
 obj-y				+= gpio.o

diff --git a/trunk/arch/arm/plat-samsung/dma.c b/trunk/arch/arm/plat-samsung/dma.c
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c/dma.c
+/* linux/arch/arm/plat-samsung/dma.c
  *
  * Copyright (c) 2003-2009 Simtec Electronics
  *	Ben Dooks <ben@simtec.co.uk>

diff --git a/trunk/arch/arm/plat-s3c/init.c → trunk/arch/arm/plat-samsung/init.c b/trunk/arch/arm/plat-s3c/init.c → trunk/arch/arm/plat-samsung/init.c
diff --git a/trunk/arch/arm/plat-s3c/time.c → trunk/arch/arm/plat-samsung/time.c b/trunk/arch/arm/plat-s3c/time.c → trunk/arch/arm/plat-samsung/time.c
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s3c24xx/time.c
+/* linux/arch/arm/plat-samsung/time.c
  *
  * Copyright (C) 2003-2005 Simtec Electronics
  *	Ben Dooks, <ben@simtec.co.uk>