aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-01-20 12:22:24 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-21 13:45:57 +0900
commit106cc6aa73f594015fc8b99f7c70d1b7cf23f19a (patch)
treef27c6bee20500832fda427f94b6eea40e8327c75
parentARM: SAMSUNG: Move more support into plat-samsung (diff)
downloadlinux-dev-106cc6aa73f594015fc8b99f7c70d1b7cf23f19a.tar.xz
linux-dev-106cc6aa73f594015fc8b99f7c70d1b7cf23f19a.zip
ARM: SAMSUNG: Move pmw.c to plat-samsung
Move the PWM driver support to plat-samsung, as these PWM blocks are close enough across the current range to be supported by this driver. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/plat-s3c/Makefile4
-rw-r--r--arch/arm/plat-samsung/Makefile4
-rw-r--r--arch/arm/plat-samsung/pwm.c (renamed from arch/arm/plat-s3c/pwm.c)0
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile
index 20cb335aa75b..095bc97cd6ce 100644
--- a/arch/arm/plat-s3c/Makefile
+++ b/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/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 27d5bfb60b2e..f31e64f3a1c3 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/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/arch/arm/plat-s3c/pwm.c b/arch/arm/plat-samsung/pwm.c
index ef019f27b67d..ef019f27b67d 100644
--- a/arch/arm/plat-s3c/pwm.c
+++ b/arch/arm/plat-samsung/pwm.c