Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-mips / errno.h

diff --git a/include/asm-mips/errno.h b/include/asm-mips/errno.h
index 9d3e6e7cdb9212db444705b88b8e2faa9c6e4f1a..3c0d840e45773e867980116affb51aae255273f5 100644 (file)
--- a/include/asm-mips/errno.h
+++ b/include/asm-mips/errno.h
@@ -119,10 +119,6 @@
 #define        EOWNERDEAD      165     /* Owner died */
 #define        ENOTRECOVERABLE 166     /* State not recoverable */
 
-/* for robust mutexes */
-#define        EOWNERDEAD      165     /* Owner died */
-#define        ENOTRECOVERABLE 166     /* State not recoverable */
-
 #define EDQUOT         1133    /* Quota exceeded */
 
 #ifdef __KERNEL__