diff --git a/[refs] b/[refs]
index 86de09aab3df..cb026f223635 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6890556c140469622497bea98cf49bf93f92f922
+refs/heads/master: 106cc6aa73f594015fc8b99f7c70d1b7cf23f19a
diff --git a/trunk/arch/arm/plat-s3c/Makefile b/trunk/arch/arm/plat-s3c/Makefile
index 20cb335aa75b..095bc97cd6ce 100644
--- a/trunk/arch/arm/plat-s3c/Makefile
+++ b/trunk/arch/arm/plat-s3c/Makefile
@@ -22,7 +22,3 @@ obj-$(CONFIG_S3C_DMA)		+= dma.o
 
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_S3C2410_PM_CHECK)	+= pm-check.o
-
-# PWM support
-
-obj-$(CONFIG_HAVE_PWM)		+= pwm.o
diff --git a/trunk/arch/arm/plat-samsung/Makefile b/trunk/arch/arm/plat-samsung/Makefile
index 27d5bfb60b2e..f31e64f3a1c3 100644
--- a/trunk/arch/arm/plat-samsung/Makefile
+++ b/trunk/arch/arm/plat-samsung/Makefile
@@ -42,3 +42,7 @@ obj-$(CONFIG_S3C_DEV_NAND)	+= dev-nand.o
 # PM support
 
 obj-$(CONFIG_PM)		+= pm-gpio.o
+
+# PWM support
+
+obj-$(CONFIG_HAVE_PWM)		+= pwm.o
diff --git a/trunk/arch/arm/plat-s3c/pwm.c b/trunk/arch/arm/plat-samsung/pwm.c
similarity index 100%
rename from trunk/arch/arm/plat-s3c/pwm.c
rename to trunk/arch/arm/plat-samsung/pwm.c