---

yaml --- r: 187404 b: refs/heads/master c: 106cc6a h: refs/heads/master v: v3
git-mirror · Jan 21, 2010 · 2cd6eb8 · 2cd6eb8
1 parent f752601
commit 2cd6eb8
Show file tree

Hide file tree

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