diff --git a/[refs] b/[refs]
index efb5ede7a39a..8aa1b213d161 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
+refs/heads/master: 593c252a731389ffdd00d4cb2d20192c47aa18c1
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index bf1f8dba02f3..d56d21c0573b 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1759,7 +1759,7 @@ comment "At least one emulation must be selected"
 
 config FPE_NWFPE
 	bool "NWFPE math emulation"
-	depends on !AEABI || OABI_COMPAT
+	depends on (!AEABI || OABI_COMPAT) && !THUMB2_KERNEL
 	---help---
 	  Say Y to include the NWFPE floating point emulator in the kernel.
 	  This is necessary to run most binaries. Linux does not currently