diff --git a/[refs] b/[refs]
index fd16aaab2b7e..03b2fe1f6fbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a7d68e899b7f609708e7590784344f03640f774
+refs/heads/master: b8c141e8fd80fa64d80c6a74492053f25a28e0ea
diff --git a/trunk/fs/Kconfig.binfmt b/trunk/fs/Kconfig.binfmt
index 55e8ee1900a5..3263084eef9e 100644
--- a/trunk/fs/Kconfig.binfmt
+++ b/trunk/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.