From 04bce99d87b501e3767b1e45721744c1d9ea13c5 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Mon, 13 Apr 2009 16:28:02 +0800 Subject: [PATCH] --- yaml --- r: 149330 b: refs/heads/master c: 3852ac7113f313d96af80257a070fd8ab2eea5c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/Makefile | 1 - trunk/arch/arm/plat-pxa/Makefile | 2 ++ trunk/arch/arm/{mach-pxa => plat-pxa}/pwm.c | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename trunk/arch/arm/{mach-pxa => plat-pxa}/pwm.c (100%) diff --git a/[refs] b/[refs] index 76f138205a46..a667ae6ee4bf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a71ef16327a534a88fb1277d28dcd362dbb1992f +refs/heads/master: 3852ac7113f313d96af80257a070fd8ab2eea5c6 diff --git a/trunk/arch/arm/mach-pxa/Makefile b/trunk/arch/arm/mach-pxa/Makefile index 4bcebf72074a..47d01572a04d 100644 --- a/trunk/arch/arm/mach-pxa/Makefile +++ b/trunk/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/trunk/arch/arm/plat-pxa/Makefile b/trunk/arch/arm/plat-pxa/Makefile index 8f2c4c7fbd48..0264bfb0ca4f 100644 --- a/trunk/arch/arm/plat-pxa/Makefile +++ b/trunk/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/trunk/arch/arm/mach-pxa/pwm.c b/trunk/arch/arm/plat-pxa/pwm.c similarity index 100% rename from trunk/arch/arm/mach-pxa/pwm.c rename to trunk/arch/arm/plat-pxa/pwm.c