---

yaml --- r: 137116 b: refs/heads/master c: 73921ea h: refs/heads/master v: v3
git-mirror · Jan 21, 2009 · 186a8db · 186a8db
1 parent 52c4a3a
commit 186a8db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b25a386b9c68ed23c3b2656f44b523e61480218b
+refs/heads/master: 73921ea5b5ccfe0bbe4c1dfcd1a60fdadc7c7d1e
diff --git a/trunk/arch/arm/configs/magician_defconfig b/trunk/arch/arm/configs/magician_defconfig
@@ -4,6 +4,7 @@
 # Sat Jan 17 17:47:17 2009
 #
 CONFIG_ARM=y
+CONFIG_HAVE_PWM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_GENERIC_TIME=y
@@ -191,7 +192,7 @@ CONFIG_MACH_MAGICIAN=y
 # CONFIG_ARCH_PXA_PALM is not set
 # CONFIG_PXA_EZX is not set
 CONFIG_PXA27x=y
-# CONFIG_PXA_PWM is not set
+CONFIG_PXA_PWM=y
 CONFIG_PXA_HAVE_BOARD_IRQS=y
 
 #
@@ -895,6 +896,7 @@ CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_PLATFORM is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_PWM=y
 
 #
 # Display device support

diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig
@@ -295,6 +295,7 @@ config MACH_MAGICIAN
 	bool "Enable HTC Magician Support"
 	select PXA27x
 	select IWMMXT
+	select HAVE_PWM
 	select PXA_HAVE_BOARD_IRQS
 
 config MACH_MIOA701