[PATCH] ia64: system type Kconfig cleanup

Fix system type selection to workaround menuconfig bug (select "HP",
get "HP-simulator").

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index e1f4c0864bd6ffedf4106f77e8ce933202694aee..4f514bae9d9fa744bd1e9a35febb17755276526b 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -70,26 +70,18 @@ config IA64_GENERIC
          will run on any supported IA-64 system.  However, if you configure
          a kernel for your specific system, it will be faster and smaller.
 
-         To find out what type of IA-64 system you have, you may want to
-         check the IA-64 Linux web site at <http://www.linux-ia64.org/>.
-         As of the time of this writing, most hardware is DIG compliant,
-         so the "DIG-compliant" option is usually the right choice.
-
-         HP-simulator   For the HP simulator
-         (<http://software.hp.com/ia64linux/>).
-         HP-zx1         For HP zx1-based systems.
-         SGI-SN2        For SGI Altix systems
          DIG-compliant  For DIG ("Developer's Interface Guide") compliant
-         systems.
+         systems
+         HP-zx1         For HP systems
+         SGI-SN2        For SGI Altix systems
+         Ski-simulator  For the HP simulator
+         (<http://www.hpl.hp.com/research/linux/ski/>)
 
          If you don't know what to do, choose "generic".
 
 config IA64_DIG
        bool "DIG-compliant"
 
-config IA64_HP_SIM
-       bool "HP-simulator"
-
 config IA64_HP_ZX1
        bool "HP-zx1"
        help
@@ -100,6 +92,9 @@ config IA64_HP_ZX1
 config IA64_SGI_SN2
        bool "SGI-SN2"
 
+config IA64_HP_SIM
+       bool "Ski-simulator"
+
 endchoice
 
 choice