Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

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

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index c7e229b..79f0b1f 100644 (file)
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -22,6 +22,7 @@ comment "OMAP Board Type"
 config MACH_OMAP_INNOVATOR
        bool "TI Innovator"
        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)
+       select OMAP_MCBSP
        help
           TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
           have such a board.
@@ -29,6 +30,7 @@ config MACH_OMAP_INNOVATOR
 config MACH_OMAP_H2
        bool "TI H2 Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+       select OMAP_MCBSP
        help
          TI OMAP 1610/1611B H2 board support. Say Y here if you have such
          a board.
@@ -36,6 +38,7 @@ config MACH_OMAP_H2
 config MACH_OMAP_H3
        bool "TI H3 Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
+#      select GPIOEXPANDER_OMAP
        help
          TI OMAP 1710 H3 board support. Say Y here if you have such
          a board.
@@ -43,7 +46,7 @@ config MACH_OMAP_H3
 config MACH_OMAP_OSK
        bool "TI OSK Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
-       select TPS65010
+       select OMAP_MCBSP
        help
          TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
           if you have such a board.
@@ -81,11 +84,39 @@ config MACH_OMAP_PALMTE
        bool "Palm Tungsten E"
        depends on ARCH_OMAP1 && ARCH_OMAP15XX
        help
-          Support for the Palm Tungsten E PDA. Currently only the LCD panel
-          is supported. To boot the kernel, you'll need a PalmOS compatible
-          bootloader; check out http://palmtelinux.sourceforge.net for more
-          information.
-          Say Y here if you have such a PDA, say NO otherwise.
+         Support for the Palm Tungsten E PDA.  To boot the kernel, you'll
+         need a PalmOS compatible bootloader; check out
+         http://palmtelinux.sourceforge.net/ for more information.
+         Say Y here if you have this PDA model, say N otherwise.
+
+config MACH_OMAP_PALMZ71
+       bool "Palm Zire71"
+       depends on ARCH_OMAP1 && ARCH_OMAP15XX
+       help
+        Support for the Palm Zire71 PDA. To boot the kernel,
+        you'll need a PalmOS compatible bootloader; check out
+        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"