diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 22:22:24 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-20 23:45:57 -0500 |
commit | 106cc6aa73f594015fc8b99f7c70d1b7cf23f19a (patch) | |
tree | f27c6bee20500832fda427f94b6eea40e8327c75 | |
parent | 6890556c140469622497bea98cf49bf93f92f922 (diff) |
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/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Makefile | 4 | ||||
-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 | |||
22 | 22 | ||
23 | obj-$(CONFIG_PM) += pm.o | 23 | obj-$(CONFIG_PM) += pm.o |
24 | obj-$(CONFIG_S3C2410_PM_CHECK) += pm-check.o | 24 | obj-$(CONFIG_S3C2410_PM_CHECK) += pm-check.o |
25 | |||
26 | # PWM support | ||
27 | |||
28 | 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 | |||
42 | # PM support | 42 | # PM support |
43 | 43 | ||
44 | obj-$(CONFIG_PM) += pm-gpio.o | 44 | obj-$(CONFIG_PM) += pm-gpio.o |
45 | |||
46 | # PWM support | ||
47 | |||
48 | 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 | |||