Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index a7a111db25b2c43daeb8b7847f92858b9e2e92fd..b627f8dbcaad5da32b4b5ffe1cad244d820bc898 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -34,6 +34,10 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default y
 
+config AUDIT_ARCH
+       bool
+       default y
+
 choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB
@@ -334,7 +338,7 @@ config COMPAT
        default y
 
 config BINFMT_ELF32
-       tristate "Kernel support for 32-bit ELF binaries"
+       bool "Kernel support for 32-bit ELF binaries"
        depends on SPARC32_COMPAT
        help
          This allows you to run 32-bit Linux/ELF binaries on your Ultra.
@@ -416,7 +420,7 @@ source "arch/sparc64/oprofile/Kconfig"
 
 config KPROBES
        bool "Kprobes (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && MODULES
+       depends on KALLSYMS && EXPERIMENTAL && MODULES
        help
          Kprobes allows you to trap at almost any kernel address and
          execute a callback function.  register_kprobe() establishes