Pull video into test branch

[linux-drm-fsl-dcu.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 03d07cae26c827285f9407e47c9b46504d6a08b1..5c0a10041cd17c1fc7c9ae97a442d266b4dd8c05 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"
@@ -53,7 +51,6 @@ config PXA_SHARPSL_25x
 config PXA_SHARPSL_27x
        bool "Sharp PXA270 models (SL-Cxx00)"
        select PXA27x
-       select IWMMXT
 
 endchoice
 
@@ -78,28 +75,28 @@ endmenu
 
 config MACH_POODLE
        bool "Enable Sharp SL-5600 (Poodle) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
        select SHARP_LOCOMO
        select PXA_SSP
 
 config MACH_CORGI
        bool "Enable Sharp SL-C700 (Corgi) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
        select PXA_SHARP_C7xx
 
 config MACH_SHEPHERD
        bool "Enable Sharp SL-C750 (Shepherd) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
        select PXA_SHARP_C7xx
 
 config MACH_HUSKY
        bool "Enable Sharp SL-C760 (Husky) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
        select PXA_SHARP_C7xx
 
 config MACH_AKITA
        bool "Enable Sharp SL-1000 (Akita) Support"
-       depends PXA_SHARPSL_27x
+       depends on PXA_SHARPSL_27x
        select PXA_SHARP_Cxx00
        select MACH_SPITZ
        select I2C
@@ -107,17 +104,17 @@ config MACH_AKITA
 
 config MACH_SPITZ
        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-       depends PXA_SHARPSL_27x
+       depends on PXA_SHARPSL_27x
        select PXA_SHARP_Cxx00
 
 config MACH_BORZOI
        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-       depends PXA_SHARPSL_27x
+       depends on PXA_SHARPSL_27x
        select PXA_SHARP_Cxx00
 
 config MACH_TOSA
        bool "Enable Sharp SL-6000x (Tosa) Support"
-       depends PXA_SHARPSL_25x
+       depends on PXA_SHARPSL_25x
 
 config PXA25x
        bool
@@ -129,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