From d3eaf6a218a119f8435b5b40bcbde667f30df825 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Mon, 13 Apr 2009 16:09:21 +0800 Subject: [PATCH] --- yaml --- r: 149329 b: refs/heads/master c: a71ef16327a534a88fb1277d28dcd362dbb1992f h: refs/heads/master i: 149327: 2a3b2f7f26a406339ccbddb539c2232d7ff72bb6 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/Kconfig | 6 ------ trunk/arch/arm/mach-pxa/Makefile | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index c022e9b9721a..76f138205a46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a757ad8b391adb2129f8357545aaa678099df473 +refs/heads/master: a71ef16327a534a88fb1277d28dcd362dbb1992f diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index 17d3fbd368a3..47747f96f125 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/arch/arm/mach-pxa/Kconfig @@ -505,12 +505,6 @@ config PXA_SSP help Enable support for PXA2xx SSP ports -config PXA_PWM - tristate - default BACKLIGHT_PWM - help - Enable support for PXA2xx/PXA3xx PWM controllers - config TOSA_BT tristate "Control the state of built-in bluetooth chip on Sharp SL-6000" depends on MACH_TOSA diff --git a/trunk/arch/arm/mach-pxa/Makefile b/trunk/arch/arm/mach-pxa/Makefile index 682dbf4e14b0..4bcebf72074a 100644 --- a/trunk/arch/arm/mach-pxa/Makefile +++ b/trunk/arch/arm/mach-pxa/Makefile @@ -15,7 +15,7 @@ endif # Generic drivers that other drivers may depend upon obj-$(CONFIG_PXA_SSP) += ssp.o -obj-$(CONFIG_PXA_PWM) += pwm.o +obj-$(CONFIG_HAVE_PWM) += pwm.o # SoC-specific code obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o