diff --git a/[refs] b/[refs]
index 6b043d72b6b9..c859ed49ed8f 100644
--- 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
index 89dbdb0adebf..197b9bd139ac 100644
--- 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
index c8c8caec8cde..629fd9f92a24 100644
--- 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 b/trunk/arch/arm/plat-samsung/pm.c
similarity index 100%
rename from trunk/arch/arm/plat-s3c/pm.c
rename to trunk/arch/arm/plat-samsung/pm.c