Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 3818b472022121c0a817deb5eb54bece5c002c5c..1a7ceb8866f9b7264d401a7e38a96a619e839612 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -189,7 +189,6 @@ config MACH_ARMCORE
 
 config MACH_MAGICIAN
        bool "Enable HTC Magician Support"
-       depends on ARCH_PXA
        select PXA27x
        select IWMMXT
 
@@ -199,6 +198,20 @@ config MACH_PCM027
        select IWMMXT
        select PXA_SSP
 
+config ARCH_PXA_PALM
+       bool "PXA based Palm PDAs"
+       select HAVE_PWM
+
+config MACH_PALMTX
+       bool "Palm T|X"
+       default y
+       depends on ARCH_PXA_PALM
+       select PXA27x
+       select IWMMXT
+       help
+         Say Y here if you intend to run this kernel on a Palm T|X
+         handheld computer.
+
 config MACH_PCM990_BASEBOARD
        bool "PHYTEC PCM-990 development board"
        select HAVE_PWM