Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / arch / sparc64 / Kconfig

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 7392ea9c23016375a02fac281c00b26585c1216c..463d1be32c98614cea3fc98cb31154895a5858eb 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -8,10 +8,14 @@ mainmenu "Linux/UltraSPARC Kernel Configuration"
 config SPARC
        bool
        default y
+       select HAVE_OPROFILE
+       select HAVE_KPROBES
+       select HAVE_KRETPROBES
 
 config SPARC64
        bool
        default y
+       select HAVE_IDE
        help
          SPARC is a family of RISC microprocessors designed and marketed by
          Sun Microsystems, incorporated.  This port covers the newer 64-bit
@@ -38,6 +42,10 @@ config MMU
        bool
        default y
 
+config IOMMU_HELPER
+       bool
+       default y
+
 config QUICKLIST
        bool
        default y
@@ -79,6 +87,9 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
        bool
        def_bool y
 
+config ARCH_SUPPORTS_AOUT
+       def_bool y
+
 choice
        prompt "Kernel page size"
        default SPARC64_PAGE_SIZE_8KB
@@ -378,17 +389,11 @@ config COMPAT
        bool
        depends on SPARC32_COMPAT
        default y
-
-config BINFMT_ELF32
-       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.
-         Everybody wants this; say Y.
+       select COMPAT_BINFMT_ELF
 
 config BINFMT_AOUT32
        bool "Kernel support for 32-bit (ie. SunOS) a.out binaries"
-       depends on SPARC32_COMPAT
+       depends on SPARC32_COMPAT && ARCH_SUPPORTS_AOUT
        help
          This allows you to run 32-bit a.out format binaries on your Ultra.
          If you want to run SunOS binaries (see SunOS binary emulation below)
@@ -464,8 +469,6 @@ source "drivers/sbus/char/Kconfig"
 
 source "fs/Kconfig"
 
-source "kernel/Kconfig.instrumentation"
-
 source "arch/sparc64/Kconfig.debug"
 
 source "security/Kconfig"