Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 55e8d2f..e8ee7ec 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -16,6 +16,9 @@ config CPU_PXA310
 config CPU_PXA320
        bool "PXA320 (codename Monahans-P)"
 
+config CPU_PXA930
+       bool "PXA930 (codename Tavor-P)"
+
 endmenu
 
 endif
@@ -184,7 +187,7 @@ config MACH_COLIBRI
        select PXA27x
 
 config MACH_ZYLONITE
-       bool "PXA3xx Development Platform"
+       bool "PXA3xx Development Platform (aka Zylonite)"
        select PXA3xx
        select HAVE_PWM
 
@@ -193,6 +196,16 @@ config MACH_LITTLETON
        select PXA3xx
        select PXA_SSP
 
+config MACH_TAVOREVB
+       bool "PXA930 Evaluation Board (aka TavorEVB)"
+       select PXA3xx
+       select PXA930
+
+config MACH_SAAR
+       bool "PXA930 Handheld Platform (aka SAAR)"
+       select PXA3xx
+       select PXA930
+
 config MACH_ARMCORE
        bool "CompuLab CM-X270 modules"
        select PXA27x
@@ -200,7 +213,6 @@ config MACH_ARMCORE
 
 config MACH_MAGICIAN
        bool "Enable HTC Magician Support"
-       depends on ARCH_PXA
        select PXA27x
        select IWMMXT
 
@@ -210,6 +222,20 @@ config MACH_PCM027
        select IWMMXT
        select PXA_SSP
 
+config ARCH_PXA_PALM
+       bool "PXA based Palm PDAs"
+       select HAVE_PWM
+
+config MACH_PALMTX
+       bool "Palm T|X"
+       default y
+       depends on ARCH_PXA_PALM
+       select PXA27x
+       select IWMMXT
+       help
+         Say Y here if you intend to run this kernel on a Palm T|X
+         handheld computer.
+
 config MACH_PCM990_BASEBOARD
        bool "PHYTEC PCM-990 development board"
        select HAVE_PWM
@@ -231,6 +257,42 @@ config PCM990_DISPLAY_NONE
 endchoice
 
 
+config PXA_EZX
+       bool "Motorola EZX Platform"
+       select PXA27x
+       select IWMMXT
+       select HAVE_PWM
+
+config MACH_EZX_A780
+       bool "Motorola EZX A780"
+       default y
+       depends on PXA_EZX
+
+config MACH_EZX_E680
+       bool "Motorola EZX E680"
+       default y
+       depends on PXA_EZX
+
+config MACH_EZX_A1200
+       bool "Motorola EZX A1200"
+       default y
+       depends on PXA_EZX
+
+config MACH_EZX_A910
+       bool "Motorola EZX A910"
+       default y
+       depends on PXA_EZX
+
+config MACH_EZX_E6
+       bool "Motorola EZX E6"
+       default y
+       depends on PXA_EZX
+
+config MACH_EZX_E2
+       bool "Motorola EZX E2"
+       default y
+       depends on PXA_EZX
+
 endmenu
 
 config PXA25x
@@ -272,4 +334,13 @@ config PXA_PWM
        default BACKLIGHT_PWM
        help
          Enable support for PXA2xx/PXA3xx PWM controllers
+
+config TOSA_BT
+       tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
+       depends on MACH_TOSA
+       select RFKILL
+       help
+         This is a simple driver that is able to control
+         the state of built in bluetooth chip on tosa.
+
 endif