diff --git a/[refs] b/[refs]
index 9b6d17e2694d..8670821653ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d94af931af42152e34539dd4782b1724084a89fb
+refs/heads/master: de290166552a037234bca44ed4bcbf4a4e9f5be9
diff --git a/trunk/include/asm-m68knommu/ptrace.h b/trunk/include/asm-m68knommu/ptrace.h
index f65bd90749e6..1e19c457de7d 100644
--- a/trunk/include/asm-m68knommu/ptrace.h
+++ b/trunk/include/asm-m68knommu/ptrace.h
@@ -70,7 +70,7 @@ struct switch_stack {
 /* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */
 #define PTRACE_GETREGS            12
 #define PTRACE_SETREGS            13
-#ifdef COFNIG_FPU
+#ifdef CONFIG_FPU
 #define PTRACE_GETFPREGS          14
 #define PTRACE_SETFPREGS          15
 #endif