Merge branch 'linus' into x86/gart

[mv-sheeva.git] / include / asm-h8300 / socket.h

diff --git a/include/asm-h8300/socket.h b/include/asm-h8300/socket.h
index 39911d8c968406c5040dab05d8c8d5b792d09bec..da2520dbf2547e2643af27749b178e7e5a4dd0eb 100644 (file)
--- a/include/asm-h8300/socket.h
+++ b/include/asm-h8300/socket.h
@@ -52,4 +52,6 @@
 #define SO_TIMESTAMPNS         35
 #define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
+#define SO_MARK                        36
+
 #endif /* _ASM_SOCKET_H */