diff --git a/[refs] b/[refs]
index 6f64eca3eb79..5f680f4f6c15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36bbfe2f097d5e09e8e9c83f55264bd538a0ebe1
+refs/heads/master: 2961b423037da60a8cb230963ee0d8c04473d73b
diff --git a/trunk/include/asm-mips/types.h b/trunk/include/asm-mips/types.h
index 7a2ee4f40131..bcbb8d675af5 100644
--- a/trunk/include/asm-mips/types.h
+++ b/trunk/include/asm-mips/types.h
@@ -19,8 +19,6 @@
 
 typedef unsigned short umode_t;
 
-#endif
-
 #endif /* __ASSEMBLY__ */
 
 /*