Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / Kconfig.binfmt

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 72c03354c14bf5e10c405f8d778d581f18c2e250..c7efddf6e0380988b63337cef8c0657e0df53ec8 100644 (file)
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -89,7 +89,8 @@ config BINFMT_SCRIPT
 
 config BINFMT_FLAT
        bool "Kernel support for flat binaries"
-       depends on !MMU && (!FRV || BROKEN)
+       depends on !MMU || M68K
+       depends on !FRV || BROKEN
        help
          Support uClinux FLAT format binaries.