Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-fixes

[linux.git] / fs / Kconfig.binfmt

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index b2f82cf6bf86826050038af029e8bd311f6555a7..58c2bbd385ad498f92cc4fc1a3957a3455ee095d 100644 (file)
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -34,8 +34,8 @@ config ARCH_BINFMT_ELF_STATE
 
 config BINFMT_ELF_FDPIC
        bool "Kernel support for FDPIC ELF binaries"
-       default y
-       depends on (FRV || BLACKFIN || (SUPERH32 && !MMU) || C6X)
+       default y if !BINFMT_ELF
+       depends on (ARM || FRV || BLACKFIN || (SUPERH32 && !MMU) || C6X)
        select ELFCORE
        help
          ELF FDPIC binaries are based on ELF, but allow the individual load