diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-09 12:19:41 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-09 12:19:41 +1000 |
| commit | 8a3e1c670e503ddd6f6c373b307f38b783ee3a50 (patch) | |
| tree | 03094e8425b750d2693a271ebc89b49312e5476a /fs/Kconfig.binfmt | |
| parent | e026892c85571e12f11abffde5a90bcc704d663e (diff) | |
| parent | 60d5019be8acef268f4676d229c490186d338fbc (diff) | |
Merge branch 'merge'
Conflicts:
arch/powerpc/sysdev/fsl_soc.c
Diffstat (limited to 'fs/Kconfig.binfmt')
| -rw-r--r-- | fs/Kconfig.binfmt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 55e8ee1900a5..3263084eef9e 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -42,7 +42,7 @@ config BINFMT_ELF_FDPIC config BINFMT_FLAT bool "Kernel support for flat binaries" - depends on !MMU + depends on !MMU && (!FRV || BROKEN) help Support uClinux FLAT format binaries. |