diff options
-rw-r--r-- | arch/arm/configs/magician_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/Kconfig | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index 7adb09806d4e..dde50df09bce 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig | |||
@@ -4,6 +4,7 @@ | |||
4 | # Sat Jan 17 17:47:17 2009 | 4 | # Sat Jan 17 17:47:17 2009 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_HAVE_PWM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 8 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | CONFIG_GENERIC_GPIO=y | 9 | CONFIG_GENERIC_GPIO=y |
9 | CONFIG_GENERIC_TIME=y | 10 | CONFIG_GENERIC_TIME=y |
@@ -191,7 +192,7 @@ CONFIG_MACH_MAGICIAN=y | |||
191 | # CONFIG_ARCH_PXA_PALM is not set | 192 | # CONFIG_ARCH_PXA_PALM is not set |
192 | # CONFIG_PXA_EZX is not set | 193 | # CONFIG_PXA_EZX is not set |
193 | CONFIG_PXA27x=y | 194 | CONFIG_PXA27x=y |
194 | # CONFIG_PXA_PWM is not set | 195 | CONFIG_PXA_PWM=y |
195 | CONFIG_PXA_HAVE_BOARD_IRQS=y | 196 | CONFIG_PXA_HAVE_BOARD_IRQS=y |
196 | 197 | ||
197 | # | 198 | # |
@@ -895,6 +896,7 @@ CONFIG_LCD_CLASS_DEVICE=y | |||
895 | # CONFIG_LCD_PLATFORM is not set | 896 | # CONFIG_LCD_PLATFORM is not set |
896 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 897 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
897 | # CONFIG_BACKLIGHT_GENERIC is not set | 898 | # CONFIG_BACKLIGHT_GENERIC is not set |
899 | CONFIG_BACKLIGHT_PWM=y | ||
898 | 900 | ||
899 | # | 901 | # |
900 | # Display device support | 902 | # Display device support |
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index af5b5b463a27..a2ed2aa731b6 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
@@ -295,6 +295,7 @@ config MACH_MAGICIAN | |||
295 | bool "Enable HTC Magician Support" | 295 | bool "Enable HTC Magician Support" |
296 | select PXA27x | 296 | select PXA27x |
297 | select IWMMXT | 297 | select IWMMXT |
298 | select HAVE_PWM | ||
298 | select PXA_HAVE_BOARD_IRQS | 299 | select PXA_HAVE_BOARD_IRQS |
299 | 300 | ||
300 | config MACH_MIOA701 | 301 | config MACH_MIOA701 |