2.6.25-rc7

 fs

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index d4fc609..b5c3b61 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -23,6 +23,10 @@ config BINFMT_ELF
      ld.so (check the file <file:Documentation/Changes> for location and
      latest version).
 
+config COMPAT_BINFMT_ELF
+   bool
+   depends on COMPAT && MMU
+
 config BINFMT_ELF_FDPIC
    bool "Kernel support for FDPIC ELF binaries"
    default y
@@ -57,7 +61,8 @@ config BINFMT_SHARED_FLAT
 
 config BINFMT_AOUT
    tristate "Kernel support for a.out and ECOFF binaries"
-   depends on X86_32 || ALPHA || ARM || M68K || SPARC32
+   depends on ARCH_SUPPORTS_AOUT && \
+      (X86_32 || ALPHA || ARM || M68K || SPARC32)
    ---help---
      A.out (Assembler.OUTput) is a set of formats for libraries and
      executables used in the earliest versions of UNIX.  Linux used