x86/centaur: merge 32 & 64 bit version

[mv-sheeva.git] / arch / x86 / Kconfig.cpu

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index a95eaf0e582ada3e141ee0ae35fa5d17eb056f1b..924e156a85abdf61627336e41e97283393e8709f 100644 (file)
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -456,24 +456,9 @@ config CPU_SUP_AMD
 
          If unsure, say N.
 
-config CPU_SUP_CENTAUR_32
+config CPU_SUP_CENTAUR
        default y
        bool "Support Centaur processors" if PROCESSOR_SELECT
-       depends on !64BIT
-       ---help---
-         This enables detection, tunings and quirks for Centaur processors
-
-         You need this enabled if you want your kernel to run on a
-         Centaur CPU. Disabling this option on other types of CPUs
-         makes the kernel a tiny bit smaller. Disabling it on a Centaur
-         CPU might render the kernel unbootable.
-
-         If unsure, say N.
-
-config CPU_SUP_CENTAUR_64
-       default y
-       bool "Support Centaur processors" if PROCESSOR_SELECT
-       depends on 64BIT
        ---help---
          This enables detection, tunings and quirks for Centaur processors