diff --git a/[refs] b/[refs]
index 58d378d8b626..4362ffcd942e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63dc68a8cf60cb110b147dab1704d990808b39e2
+refs/heads/master: e303e088f25dc7d8bafc0d1942314214a3a57b44
diff --git a/trunk/include/asm-mips/atomic.h b/trunk/include/asm-mips/atomic.h
index e64abc0d8221..7978d8e11647 100644
--- a/trunk/include/asm-mips/atomic.h
+++ b/trunk/include/asm-mips/atomic.h
@@ -9,16 +9,8 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996, 97, 99, 2000, 03, 04 by Ralf Baechle
+ * Copyright (C) 1996, 97, 99, 2000, 03, 04, 06 by Ralf Baechle
  */
-
-/*
- * As workaround for the ATOMIC_DEC_AND_LOCK / atomic_dec_and_lock mess in
- * <linux/spinlock.h> we have to include <linux/spinlock.h> outside the
- * main big wrapper ...
- */
-#include <linux/spinlock.h>
-
 #ifndef _ASM_ATOMIC_H
 #define _ASM_ATOMIC_H