diff --git a/[refs] b/[refs]
index e70ec6e511cf..e54480b49fa5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f79e48ae2651fff08d08dab3acf1294467c1155
+refs/heads/master: b9d36d5d000294a128f7f174fe67623a10e29d61
diff --git a/trunk/fs/Kconfig.binfmt b/trunk/fs/Kconfig.binfmt
index d4fc6095466d..7c3d5f923da1 100644
--- a/trunk/fs/Kconfig.binfmt
+++ b/trunk/fs/Kconfig.binfmt
@@ -23,6 +23,10 @@ config BINFMT_ELF
 	  ld.so (check the file <file:Documentation/Changes> for location and
 	  latest version).
 
+config COMPAT_BINFMT_ELF
+	bool
+	depends on COMPAT && MMU
+
 config BINFMT_ELF_FDPIC
 	bool "Kernel support for FDPIC ELF binaries"
 	default y
diff --git a/trunk/fs/Makefile b/trunk/fs/Makefile
index 500cf15cdb4b..1e7a11bd4da1 100644
--- a/trunk/fs/Makefile
+++ b/trunk/fs/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_BINFMT_MISC)	+= binfmt_misc.o
 obj-y				+= binfmt_script.o
 
 obj-$(CONFIG_BINFMT_ELF)	+= binfmt_elf.o
+obj-$(CONFIG_COMPAT_BINFMT_ELF)	+= compat_binfmt_elf.o
 obj-$(CONFIG_BINFMT_ELF_FDPIC)	+= binfmt_elf_fdpic.o
 obj-$(CONFIG_BINFMT_SOM)	+= binfmt_som.o
 obj-$(CONFIG_BINFMT_FLAT)	+= binfmt_flat.o