diff --git a/[refs] b/[refs]
index 4f85ef80c9e8..20958febbd53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32782d51e95bb891695049033d0ba9ce0eefcd84
+refs/heads/master: 8affd3e8122537a295bb69571a68f816a5e6867c
diff --git a/trunk/arch/m68k/include/asm/Kbuild b/trunk/arch/m68k/include/asm/Kbuild
index bf28713c2f15..a494c3eab9f2 100644
--- a/trunk/arch/m68k/include/asm/Kbuild
+++ b/trunk/arch/m68k/include/asm/Kbuild
@@ -23,6 +23,7 @@ generic-y += resource.h
 generic-y += scatterlist.h
 generic-y += sections.h
 generic-y += siginfo.h
+generic-y += spinlock.h
 generic-y += statfs.h
 generic-y += topology.h
 generic-y += types.h
diff --git a/trunk/arch/m68k/include/asm/spinlock.h b/trunk/arch/m68k/include/asm/spinlock.h
deleted file mode 100644
index 20f46e27b534..000000000000
--- a/trunk/arch/m68k/include/asm/spinlock.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __M68K_SPINLOCK_H
-#define __M68K_SPINLOCK_H
-
-#error "m68k doesn't do SMP yet"
-
-#endif