aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/magician_defconfig1
-rw-r--r--arch/arm/mach-pxa/Kconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig
index 91bc3974f191..82428c2f234c 100644
--- a/arch/arm/configs/magician_defconfig
+++ b/arch/arm/configs/magician_defconfig
@@ -196,6 +196,7 @@ CONFIG_MACH_MAGICIAN=y
196# CONFIG_ARCH_PXA_PALM is not set 196# CONFIG_ARCH_PXA_PALM is not set
197# CONFIG_PXA_EZX is not set 197# CONFIG_PXA_EZX is not set
198CONFIG_PXA27x=y 198CONFIG_PXA27x=y
199CONFIG_PXA_SSP=y
199CONFIG_PXA_PWM=y 200CONFIG_PXA_PWM=y
200CONFIG_PXA_HAVE_BOARD_IRQS=y 201CONFIG_PXA_HAVE_BOARD_IRQS=y
201 202
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 04d1a07ced7f..33214c1e0607 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -302,6 +302,7 @@ config MACH_MAGICIAN
302 bool "Enable HTC Magician Support" 302 bool "Enable HTC Magician Support"
303 select PXA27x 303 select PXA27x
304 select IWMMXT 304 select IWMMXT
305 select PXA_SSP
305 select HAVE_PWM 306 select HAVE_PWM
306 select PXA_HAVE_BOARD_IRQS 307 select PXA_HAVE_BOARD_IRQS
307 308