Merge branch 'ks8695/timer' into next/cleanup

[~andy/linux] / arch / arm / mach-u300 / Kconfig

diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index 54d8f34fdee5d1d2770be32884011aac3949951f..f7e12ede008c11e564415cd4047045ec14a011ef 100644 (file)
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -1,6 +1,6 @@
 if ARCH_U300
 
-menu "ST-Ericsson AB U300/U330/U335/U365 Platform"
+menu "ST-Ericsson AB U300/U335 Platform"
 
 comment "ST-Ericsson Mobile Platform Products"
 
@@ -10,46 +10,7 @@ config MACH_U300
        select PINCTRL_U300
        select PINCTRL_COH901
 
-comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
-
-choice
-       prompt "U300/U330/U335/U365 system type"
-       default MACH_U300_BS2X
-       ---help---
-       You need to select the target system, i.e. the
-       U300/U330/U335/U365 board that you want to compile your kernel
-       for.
-
-config MACH_U300_BS2X
-       bool "S26/S26/B25/B26 Test Products"
-       depends on MACH_U300
-       help
-               Select this if you're developing on the
-               S26/S25 test products. (Also works on
-               B26/B25 big boards.)
-
-config MACH_U300_BS330
-       bool "S330/B330 Test Products"
-       depends on MACH_U300
-       help
-               Select this if you're developing on the
-               S330/B330 test products.
-
-config MACH_U300_BS335
-       bool "S335/B335 Test Products"
-       depends on MACH_U300
-       help
-               Select this if you're developing on the
-               S335/B335 test products.
-
-config MACH_U300_BS365
-       bool "S365/B365 Test Products"
-       depends on MACH_U300
-       help
-               Select this if you're developing on the
-               S365/B365 test products.
-
-endchoice
+comment "ST-Ericsson U300/U335 Feature Selections"
 
 config U300_DEBUG
        bool "Debug support for U300"