Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[karo-tx-linux.git] / include / asm-alpha / socket.h

diff --git a/include/asm-alpha/socket.h b/include/asm-alpha/socket.h
index 1fede7f928600bd5e4b82ddbfe04c615c8f8b2f8..08c9793199290fefc36f027da65f7e7e50f9cd43 100644 (file)
--- a/include/asm-alpha/socket.h
+++ b/include/asm-alpha/socket.h
@@ -60,4 +60,6 @@
 #define SO_SECURITY_ENCRYPTION_TRANSPORT       20
 #define SO_SECURITY_ENCRYPTION_NETWORK         21
 
+#define SO_MARK                        36
+
 #endif /* _ASM_SOCKET_H */