Merge branch 'x86/cpu' into x86/core

[linux-2.6-omap-h63xx.git] / include / asm-x86 / socket.h

diff --git a/include/asm-x86/socket.h b/include/asm-x86/socket.h
index 99ca648b94c54122057342ec4bcef093b0d0fbe6..db73274c83c3b3ea302dff7a233fab452745c838 100644 (file)
--- a/include/asm-x86/socket.h
+++ b/include/asm-x86/socket.h
@@ -1,5 +1,5 @@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
+#ifndef ASM_X86__SOCKET_H
+#define ASM_X86__SOCKET_H
 
 #include <asm/sockios.h>
 
@@ -52,4 +52,6 @@
 #define SO_TIMESTAMPNS         35
 #define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
-#endif /* _ASM_SOCKET_H */
+#define SO_MARK                        36
+
+#endif /* ASM_X86__SOCKET_H */