Merge branch 'upstream-fixes' into upstream

[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 526acbc32067e98115e857ddb66e1aa8ecd5e3ac..0104fd142e705da2ff6c9298725c675b83729726 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
@@ -77,6 +82,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"
@@ -110,12 +117,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