Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 07341f3..79f0b1f 100644 (file)
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -38,7 +38,7 @@ config MACH_OMAP_H2
 config MACH_OMAP_H3
        bool "TI H3 Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
-       select GPIOEXPANDER_OMAP
+#      select GPIOEXPANDER_OMAP
        help
          TI OMAP 1710 H3 board support. Say Y here if you have such
          a board.
@@ -98,6 +98,26 @@ config MACH_OMAP_PALMZ71
         http://hackndev.com/palm/z71 for more informations.
         Say Y here if you have such a PDA, say N otherwise.
 
+config MACH_OMAP_PALMTT
+       bool "Palm Tungsten|T"
+       depends on ARCH_OMAP1 && ARCH_OMAP15XX
+       help
+         Support for the Palm Tungsten|T PDA. To boot the kernel, you'll
+         need a PalmOS compatible bootloader (Garux); check out
+         http://www.hackndev.com/palm/tt/ for more information.
+         Say Y here if you have this PDA model, say N otherwise.
+
+config MACH_SX1
+       bool "Siemens SX1"
+       depends on ARCH_OMAP1 && ARCH_OMAP15XX
+       help
+         Support for the Siemens SX1 phone. To boot the kernel,
+         you'll need a SX1 compatible bootloader; check out
+         http://forum.oslik.ru and
+         http://www.handhelds.org/moin/moin.cgi/SiemensSX1
+         for more information.
+         Say Y here if you have such a phone, say NO otherwise.
+
 config MACH_NOKIA770
        bool "Nokia 770"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX