X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2FKconfig.binfmt;h=3263084eef9e37394ac6f736a9dc769f5be50db1;hb=a0998b50c3f0b8fdd265c63e0032f86ebe377dbf;hp=7c3d5f923da1c4f0d4d2f06392e3151649625cd3;hpb=d145c7253c8cb2ed8a75a8839621b0bb8f778820;p=linux-2.6

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 7c3d5f923d..3263084eef 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -41,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.
 
@@ -61,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)
 	---help---
 	  A.out (Assembler.OUTput) is a set of formats for libraries and
 	  executables used in the earliest versions of UNIX.  Linux used