linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / mach-omap1 / Kconfig

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index d135568..86a0f0d 100644 (file)
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -62,13 +62,6 @@ config MACH_OMAP_PERSEUS2
          Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
          a board.
 
-config MACH_OMAP_FSAMPLE
-       bool "TI F-Sample"
-       depends on ARCH_OMAP1 && ARCH_OMAP730
-       help
-         Support for TI OMAP 850 F-Sample board. Say Y here if you have such
-         a board.
-
 config MACH_VOICEBLUE
        bool "Voiceblue"
        depends on ARCH_OMAP1 && ARCH_OMAP15XX
@@ -76,6 +69,12 @@ config MACH_VOICEBLUE
          Support for Voiceblue GSM/VoIP gateway. Say Y here if you have
          such a board.
 
+config MACH_NETSTAR
+       bool "NetStar"
+       depends on ARCH_OMAP1 && ARCH_OMAP15XX
+       help
+         Support for NetStar PBX. Say Y here if you have such a board.
+
 config MACH_OMAP_PALMTE
        bool "Palm Tungsten E"
        depends on ARCH_OMAP1 && ARCH_OMAP15XX
@@ -86,20 +85,6 @@ config MACH_OMAP_PALMTE
           informations.
           Say Y here if you have such a PDA, say NO otherwise.
 
-config MACH_NOKIA770
-       bool "Nokia 770"
-       depends on ARCH_OMAP1 && ARCH_OMAP16XX
-       help
-         Support for the Nokia 770 Internet Tablet. Say Y here if you
-         have such a device.
-
-config MACH_AMS_DELTA
-       bool "Amstrad E3 (Delta)"
-       depends on ARCH_OMAP1 && ARCH_OMAP15XX
-       help
-         Support for the Amstrad E3 (codename Delta) videophone. Say Y here
-         if you have such a device.
-
 config MACH_OMAP_GENERIC
        bool "Generic OMAP board"
        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)