diff --git a/[refs] b/[refs] index 3ea231fd804f..1d28fd0668e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 860f7be283f8b8d7830a741cb72338057a753283 +refs/heads/master: 55a26aeec07f8fdb0f7027a605a430338eb78f4e diff --git a/trunk/include/asm-mn10300/socket.h b/trunk/include/asm-mn10300/socket.h index 99ca648b94c5..80af9c4ccad7 100644 --- a/trunk/include/asm-mn10300/socket.h +++ b/trunk/include/asm-mn10300/socket.h @@ -52,4 +52,6 @@ #define SO_TIMESTAMPNS 35 #define SCM_TIMESTAMPNS SO_TIMESTAMPNS +#define SO_MARK 36 + #endif /* _ASM_SOCKET_H */