Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index d3fa0f8fc613949461c82c453e35798e2625efcb..eb36f3b746b8ad280c7a26a07de046af25c01d3c 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -13,6 +13,7 @@ config SPARC64
        default y
        select HAVE_IDE
        select HAVE_LMB
+       select HAVE_ARCH_KGDB
 
 config GENERIC_TIME
        bool
@@ -348,15 +349,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