--- zzzz-none-000/linux-2.6.28.10/arch/mips/include/asm/spinlock.h	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/mips/include/asm/spinlock.h	2010-04-21 16:00:34.000000000 +0000
@@ -9,6 +9,10 @@
 #ifndef _ASM_SPINLOCK_H
 #define _ASM_SPINLOCK_H
 
+#ifndef __LINUX_SPINLOCK_H
+# error "please don't include this file directly"
+#endif
+
 #include <linux/compiler.h>
 
 #include <asm/barrier.h>
@@ -112,7 +116,7 @@
 		"	 ll	%[ticket], %[ticket_ptr]		\n"
 		"							\n"
 		"4:	andi	%[ticket], %[ticket], 0x1fff		\n"
-		"5:	sll	%[ticket], 5				\n"
+		"5:	sll %[ticket], 5				\n"
 		"							\n"
 		"6:	bnez	%[ticket], 6b				\n"
 		"	 subu	%[ticket], 1				\n"