Make x86 platform choice strings more easily selectable

arch/i386/Kconfig

@@ -40,15 +40,15 @@ menu "Processor type and features"
 
 choice
 	prompt "Subarchitecture Type"
-	default PC
+	default X86_PC
 
 config X86_PC
-	bool "IBM PC (and compatible)"
+	bool "PC-compatible"
 	help
 	  Choose this option if your computer is a standard PC or compatible.
 
 config X86_VOYAGER
-	bool "NCR Voyager"
+	bool "Voyager (NCR)"
 	help
 	  Voyager is a MCA based 32 way capable SMP architecture proprietary
 	  to NCR Corp.  Machine classes 345x/35xx/4100/51xx are voyager based.
@@ -59,7 +59,7 @@ config X86_VOYAGER
 	  say N here otherwise the kernel you build will not be bootable.
 
 config X86_NUMAQ
-	bool "IBM/Sequent NUMAQ"
+	bool "NUMAQ (IBM/Sequent)"
 	help
 	  This option is used for getting Linux to run on a (IBM/Sequent) NUMA 
 	  multiquad box. This changes the way that processors are bootstrapped,
@@ -68,7 +68,7 @@ config X86_NUMAQ
 	  email to Martin.Bligh@us.ibm.com
 
 config X86_SUMMIT
-	bool "IBM x440 (Summit/EXA)"
+	bool "Summit/EXA (IBM x440)"
 	help
 	  This option is needed for IBM systems that use the Summit/EXA chipset.
 	  In particular, it is needed for the x440.

arch/i386/defconfig

@@ -32,8 +32,10 @@ CONFIG_KMOD=y
 #
 # Processor type and features
 #
-CONFIG_PC=y
-# CONFIG_VOYAGER is not set
+CONFIG_X86_PC=y
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
@@ -70,7 +72,6 @@ CONFIG_SMP=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_NR_CPUS=32
-# CONFIG_X86_NUMA is not set
 CONFIG_X86_MCE=y
 # CONFIG_X86_MCE_NONFATAL is not set
 CONFIG_X86_MCE_P4THERMAL=y