Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

[linux-2.6] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index ea5137f319c4087df66ee8ac8478c9d5ea1be088..9e3d0bdcba071acd5e8e185aa933417367ed8d08 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -13,12 +13,10 @@ config ARCH_LUBBOCK
 config MACH_LOGICPD_PXA270
        bool "LogicPD PXA270 Card Engine Development Platform"
        select PXA27x
-       select IWMMXT
 
 config MACH_MAINSTONE
        bool "Intel HCDDBBVA0 Development Platform"
        select PXA27x
-       select IWMMXT
 
 config ARCH_PXA_IDP
        bool "Accelent Xscale IDP"
@@ -35,6 +33,10 @@ config PXA_SHARPSL
          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
          handheld computer.
 
+config MACH_TRIZEPS4
+       bool "Keith und Koep Trizeps4 DIMM-Module"
+       select PXA27x
+
 endchoice
 
 if PXA_SHARPSL
@@ -49,7 +51,21 @@ config PXA_SHARPSL_25x
 config PXA_SHARPSL_27x
        bool "Sharp PXA270 models (SL-Cxx00)"
        select PXA27x
-       select IWMMXT
+
+endchoice
+
+endif
+
+if MACH_TRIZEPS4
+
+choice
+       prompt "Select base board for Trizeps 4 module"
+
+config MACH_TRIZEPS4_CONXS
+       bool "ConXS Eval Board"
+
+config MACH_TRIZEPS4_ANY
+       bool "another Board"
 
 endchoice
 
@@ -110,11 +126,6 @@ config PXA27x
        help
          Select code specific to PXA27x variants
 
-config IWMMXT
-       bool
-       help
-         Enable support for iWMMXt
-
 config PXA_SHARP_C7xx
        bool
        select PXA_SSP