diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-04-13 10:28:02 +0200 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-05 04:32:04 +0200 |
| commit | 3852ac7113f313d96af80257a070fd8ab2eea5c6 (patch) | |
| tree | 832da261752cf561fba59119e5570cec035b82d6 | |
| parent | [ARM] pxa: build pwm.c according to HAVE_PWM instead of PXA_PWM (diff) | |
| download | linux-3852ac7113f313d96af80257a070fd8ab2eea5c6.tar.xz linux-3852ac7113f313d96af80257a070fd8ab2eea5c6.zip | |
[ARM] pxa: move pwm.c to common plat-pxa directory
Signed-off-by: Eric Miao <eric.miao@marvell.com>
| -rw-r--r-- | arch/arm/mach-pxa/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/plat-pxa/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/plat-pxa/pwm.c (renamed from arch/arm/mach-pxa/pwm.c) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile index 4bcebf72074a..47d01572a04d 100644 --- a/arch/arm/mach-pxa/Makefile +++ b/arch/arm/mach-pxa/Makefile @@ -15,7 +15,6 @@ endif # Generic drivers that other drivers may depend upon obj-$(CONFIG_PXA_SSP) += ssp.o -obj-$(CONFIG_HAVE_PWM) += pwm.o # SoC-specific code obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile index 8f2c4c7fbd48..0264bfb0ca4f 100644 --- a/arch/arm/plat-pxa/Makefile +++ b/arch/arm/plat-pxa/Makefile @@ -7,3 +7,5 @@ obj-y := dma.o obj-$(CONFIG_GENERIC_GPIO) += gpio.o obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o + +obj-$(CONFIG_HAVE_PWM) += pwm.o diff --git a/arch/arm/mach-pxa/pwm.c b/arch/arm/plat-pxa/pwm.c index 5513c51ff984..5513c51ff984 100644 --- a/arch/arm/mach-pxa/pwm.c +++ b/arch/arm/plat-pxa/pwm.c |