---

yaml --- r: 187669 b: refs/heads/master c: 806c17b h: refs/heads/master i: 187667: 5c74626 v: v3
git-mirror · Feb 23, 2010 · c6afb6c · c6afb6c
1 parent ada6c2e
commit c6afb6c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7086a9df056602c8e0d9ae8fe17b028832d05f3d
+refs/heads/master: 806c17b5497f62faa65a1fdd235b7fa2df17d704
diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile
@@ -17,7 +17,3 @@ obj-y				+= time.o
 # DMA support
 
 obj-$(CONFIG_S3C_DMA)		+= dma.o
-
-# PM support
-
-obj-$(CONFIG_PM)		+= pm.o
diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_S3C_DEV_NAND)	+= dev-nand.o
 
 # PM support
 
+obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_PM)		+= pm-gpio.o
 obj-$(CONFIG_SAMSUNG_PM_CHECK)	+= pm-check.o
 

diff --git a/trunk/arch/arm/plat-s3c/pm.c → trunk/arch/arm/plat-samsung/pm.c b/trunk/arch/arm/plat-s3c/pm.c → trunk/arch/arm/plat-samsung/pm.c