drm: make CONFIG_DRM depend on CONFIG_SHMEM.

[safe/jmp/linux-2.6] / fs / Kconfig.binfmt

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index d4fc609..801db13 100644 (file)
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -23,10 +23,14 @@ config BINFMT_ELF
          ld.so (check the file <file:Documentation/Changes> for location and
          latest version).
 
+config COMPAT_BINFMT_ELF
+       bool
+       depends on COMPAT && BINFMT_ELF
+
 config BINFMT_ELF_FDPIC
        bool "Kernel support for FDPIC ELF binaries"
        default y
-       depends on (FRV || BLACKFIN)
+       depends on (FRV || BLACKFIN || (SUPERH32 && !MMU))
        help
          ELF FDPIC binaries are based on ELF, but allow the individual load
          segments of a binary to be located in memory independently of each
@@ -37,8 +41,8 @@ config BINFMT_ELF_FDPIC
          It is also possible to run FDPIC ELF binaries on MMU linux also.
 
 config BINFMT_FLAT
-       tristate "Kernel support for flat binaries"
-       depends on !MMU
+       bool "Kernel support for flat binaries"
+       depends on !MMU && (!FRV || BROKEN)
        help
          Support uClinux FLAT format binaries.
 
@@ -55,9 +59,12 @@ config BINFMT_SHARED_FLAT
        help
          Support FLAT shared libraries
 
+config HAVE_AOUT
+       def_bool n
+
 config BINFMT_AOUT
        tristate "Kernel support for a.out and ECOFF binaries"
-       depends on X86_32 || ALPHA || ARM || M68K || SPARC32
+       depends on HAVE_AOUT
        ---help---
          A.out (Assembler.OUTput) is a set of formats for libraries and
          executables used in the earliest versions of UNIX.  Linux used