Merge commit 'v2.6.27-rc3' into x86/urgent

[linux-2.6] / include / asm-blackfin / socket.h

diff --git a/include/asm-blackfin/socket.h b/include/asm-blackfin/socket.h
index 5213c96521860dc83b3ab8755f971ca2ac5c6887..2ca702e44d4759420051ed73dc9c3662eb2fb5c4 100644 (file)
--- a/include/asm-blackfin/socket.h
+++ b/include/asm-blackfin/socket.h
@@ -50,4 +50,7 @@
 #define SO_PASSSEC             34
 #define SO_TIMESTAMPNS         35
 #define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
+
+#define SO_MARK                        36
+
 #endif                         /* _ASM_SOCKET_H */