Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 002f7b4e6ba2546d7829554963b8751f87ff09d9..c3ea215334f60cd372b158efded8bb87502d1cfb 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -4,6 +4,17 @@
 
 mainmenu "Linux/SPARC Kernel Configuration"
 
+config 64BIT
+       bool "64-bit kernel" if ARCH = "sparc"
+       default ARCH = "sparc64"
+       help
+         SPARC is a family of RISC microprocessors designed and marketed by
+         Sun Microsystems, incorporated.  They are very widely found in Sun
+         workstations and clones.
+
+         Say yes to build a 64-bit kernel - formerly known as sparc64
+         Say no to build a 32-bit kernel - formerly known as sparc
+
 config SPARC
        bool
        default y
@@ -15,27 +26,17 @@ config SPARC
        select RTC_CLASS
        select RTC_DRV_M48T59
 
-# Identify this as a Sparc32 build
 config SPARC32
-       bool
-       default y if ARCH = "sparc"
-       help
-         SPARC is a family of RISC microprocessors designed and marketed by
-         Sun Microsystems, incorporated.  They are very widely found in Sun
-         workstations and clones. This port covers the original 32-bit SPARC;
-         it is old and stable and usually considered one of the "big three"
-         along with the Intel and Alpha ports.  The UltraLinux project
-         maintains both the SPARC32 and SPARC64 ports; its web page is
-         available at <http://www.ultralinux.org/>.
+       def_bool !64BIT
 
 config SPARC64
-       bool
-       default y if ARCH = "sparc64"
+       def_bool 64BIT
        select ARCH_SUPPORTS_MSI
        select HAVE_FUNCTION_TRACER
        select HAVE_KRETPROBES
        select HAVE_KPROBES
        select HAVE_LMB
+       select HAVE_SYSCALL_WRAPPERS
        select USE_GENERIC_SMP_HELPERS if SMP
        select RTC_DRV_CMOS
        select RTC_DRV_BQ4802
@@ -53,9 +54,6 @@ config BITS
        default 32 if SPARC32
        default 64 if SPARC64
 
-config 64BIT
-       def_bool y if SPARC64
-
 config GENERIC_TIME
        bool
        default y if SPARC64