Pull cpuidle into release branch

[pandora-kernel.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 5c0a100..656d496 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -1,6 +1,24 @@
 if ARCH_PXA
 
-menu "Intel PXA2xx Implementations"
+menu "Intel PXA2xx/PXA3xx Implementations"
+
+if PXA3xx
+
+menu "Supported PXA3xx Processor Variants"
+
+config CPU_PXA300
+       bool "PXA300 (codename Monahans-L)"
+
+config CPU_PXA310
+       bool "PXA310 (codename Monahans-LV)"
+       select CPU_PXA300
+
+config CPU_PXA320
+       bool "PXA320 (codename Monahans-P)"
+
+endmenu
+
+endif
 
 choice
        prompt "Select target board"
@@ -37,6 +55,19 @@ config MACH_TRIZEPS4
        bool "Keith und Koep Trizeps4 DIMM-Module"
        select PXA27x
 
+config MACH_EM_X270
+       bool "CompuLab EM-x270 platform"
+       select PXA27x
+
+config MACH_ZYLONITE
+       bool "PXA3xx Development Platform"
+       select PXA3xx
+
+config MACH_ARMCORE
+       bool "CompuLab CM-X270 modules"
+       select PXA27x
+       select IWMMXT
+
 endchoice
 
 if PXA_SHARPSL
@@ -126,6 +157,11 @@ config PXA27x
        help
          Select code specific to PXA27x variants
 
+config PXA3xx
+       bool
+       help
+         Select code specific to PXA3xx variants
+
 config PXA_SHARP_C7xx
        bool
        select PXA_SSP