[ARM] 3260/1: remove phys_ram from struct machine_desc (part 2)

[powerpc.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 3e5f69b..c1d77f5 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -27,7 +27,8 @@ config PXA_SHARPSL
          Say Y here if you intend to run this kernel on a
          Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi),
          SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita),
-         SL-C3000 (Spitz) or SL-C3100 (Borzoi) handheld computer.
+         SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
+         handheld computer.
 
 endchoice
 
@@ -37,12 +38,13 @@ choice
        prompt "Select target Sharp Zaurus device range"
 
 config PXA_SHARPSL_25x
-       bool "Sharp PXA25x models (SL-5600 and SL-C7xx)"
+       bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)"
        select PXA25x
 
 config PXA_SHARPSL_27x
        bool "Sharp PXA270 models (SL-Cxx00)"
        select PXA27x
+       select IWMMXT
 
 endchoice
 
@@ -70,6 +72,14 @@ config MACH_HUSKY
        depends PXA_SHARPSL_25x
        select PXA_SHARP_C7xx
 
+config MACH_AKITA
+       bool "Enable Sharp SL-1000 (Akita) Support"
+       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"
        depends PXA_SHARPSL_27x
@@ -80,6 +90,10 @@ config MACH_BORZOI
        depends PXA_SHARPSL_27x
        select PXA_SHARP_Cxx00
 
+config MACH_TOSA
+       bool "Enable Sharp SL-6000x (Tosa) Support"
+       depends PXA_SHARPSL_25x
+
 config PXA25x
        bool
        help
@@ -97,12 +111,20 @@ 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
 
+config PXA_SSP
+       tristate
+       help
+         Enable support for PXA2xx SSP ports
 endif