Merge branch 'mxc-pu-imxfb' of git://pasiphae.extern.pengutronix.de/git/imx/linux...

[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 f781873431f39b52bb83f1301ce32a13eae1bb3e..6755c7d6bb31ed3ac17522bac308d6d9e8f5eeb2 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -19,6 +19,9 @@ config CPU_PXA320
 config CPU_PXA930
        bool "PXA930 (codename Tavor-P)"
 
+config CPU_PXA935
+       bool "PXA935 (codename Tavor-P65)"
+
 endmenu
 
 endif
@@ -71,6 +74,14 @@ config PXA_SHARPSL
          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
          handheld computer.
 
+config CORGI_SSP_DEPRECATED
+       bool
+       select PXA_SSP
+       help
+         This option will include corgi_ssp.c and corgi_lcd.c
+         that corgi_ts.c and other legacy drivers (corgi_bl.c
+         and sharpsl_pm.c) may depend on.
+
 config MACH_POODLE
        bool "Enable Sharp SL-5600 (Poodle) Support"
        depends on PXA_SHARPSL
@@ -191,6 +202,10 @@ config MACH_E800
 config TRIZEPS_PXA
        bool "PXA based Keith und Koep Trizeps DIMM-Modules"
 
+config MACH_H5000
+       bool "HP iPAQ h5000"
+       select PXA25x
+
 config MACH_TRIZEPS4
        bool "Keith und Koep Trizeps4 DIMM-Module"
        depends on TRIZEPS_PXA
@@ -275,7 +290,6 @@ config MACH_MIOA701
        bool "Mitac Mio A701 Support"
        select PXA27x
        select IWMMXT
-       select LEDS_GPIO
        select HAVE_PWM
        select GPIO_SYSFS
        help
@@ -378,16 +392,25 @@ endmenu
 
 config PXA25x
        bool
+       select CPU_XSCALE
        help
          Select code specific to PXA21x/25x/26x variants
 
 config PXA27x
        bool
+       select CPU_XSCALE
        help
          Select code specific to PXA27x variants
 
+config CPU_PXA26x
+       bool
+       select PXA25x
+       help
+         Select code specific to PXA26x (codename Dalhart)
+
 config PXA3xx
        bool
+       select CPU_XSC3
        help
          Select code specific to PXA3xx variants