---

yaml --- r: 149329 b: refs/heads/master c: a71ef16 h: refs/heads/master i: 149327: 2a3b2f7 v: v3
git-mirror · Jun 5, 2009 · d3eaf6a · d3eaf6a
1 parent c9a16b2
commit d3eaf6a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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