diff --git a/[refs] b/[refs]
index 81f64df74400..0bd4252fc3d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fccc5f9c3ad7b6f847883a2a03b539e96245e0c
+refs/heads/master: 92f79db1af9ff8d525dc24fa43116bd2c70ef45b
diff --git a/trunk/arch/m68k/include/asm/ptrace.h b/trunk/arch/m68k/include/asm/ptrace.h
index 0f78ccd4fd1d..0f717045bdde 100644
--- a/trunk/arch/m68k/include/asm/ptrace.h
+++ b/trunk/arch/m68k/include/asm/ptrace.h
@@ -4,9 +4,6 @@
 #include <uapi/asm/ptrace.h>
 
 #ifndef __ASSEMBLY__
-#ifdef CONFIG_COLDFIRE
-#else
-#endif
 
 #ifndef PS_S
 #define PS_S  (0x2000)