Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[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 cd506646801a4d576dad1de3f4f08b613534843c..ea5137f319c4087df66ee8ac8478c9d5ea1be088 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -10,6 +10,11 @@ config ARCH_LUBBOCK
        select PXA25x
        select SA1111
 
+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
@@ -44,6 +49,7 @@ config PXA_SHARPSL_25x
 config PXA_SHARPSL_27x
        bool "Sharp PXA270 models (SL-Cxx00)"
        select PXA27x
+       select IWMMXT
 
 endchoice
 
@@ -55,12 +61,12 @@ config MACH_POODLE
        bool "Enable Sharp SL-5600 (Poodle) Support"
        depends PXA_SHARPSL_25x
        select SHARP_LOCOMO
+       select PXA_SSP
 
 config MACH_CORGI
        bool "Enable Sharp SL-C700 (Corgi) Support"
        depends PXA_SHARPSL_25x
        select PXA_SHARP_C7xx
-       select PXA_SSP
 
 config MACH_SHEPHERD
        bool "Enable Sharp SL-C750 (Shepherd) Support"
@@ -77,6 +83,8 @@ config MACH_AKITA
        depends PXA_SHARPSL_27x
        select PXA_SHARP_Cxx00
        select MACH_SPITZ
+       select I2C
+       select I2C_PXA
 
 config MACH_SPITZ
        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
@@ -90,7 +98,7 @@ config MACH_BORZOI
 
 config MACH_TOSA
        bool "Enable Sharp SL-6000x (Tosa) Support"
-       depends PXA_SHARPSL
+       depends PXA_SHARPSL_25x
 
 config PXA25x
        bool
@@ -110,12 +118,14 @@ config IWMMXT
 config PXA_SHARP_C7xx
        bool
        select PXA_SSP
+       select SHARPSL_PM
        help
          Enable support for all Sharp C7xx models
 
 config PXA_SHARP_Cxx00
        bool
        select PXA_SSP
+       select SHARPSL_PM
        help
          Enable common support for Sharp Cxx00 models