Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index d3fa0f8fc613949461c82c453e35798e2625efcb..fca9246470b11e3beb0be6e6fe1ba65c1e7a183b 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,8 +11,11 @@ config SPARC
 config SPARC64
        bool
        default y
+       select HAVE_DYNAMIC_FTRACE
+       select HAVE_FTRACE
        select HAVE_IDE
        select HAVE_LMB
+       select HAVE_ARCH_KGDB
 
 config GENERIC_TIME
        bool
@@ -348,15 +351,8 @@ menu "Executable file formats"
 
 source "fs/Kconfig.binfmt"
 
-config SPARC32_COMPAT
-       bool "Kernel support for 32-bit SPARC binary compatibility"
-       help
-         This allows you to run 32-bit binaries on your 64-bit SPARC system.
-         Everybody wants this; say Y.
-
 config COMPAT
        bool
-       depends on SPARC32_COMPAT
        default y
        select COMPAT_BINFMT_ELF