Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

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

diff --git a/include/asm-m32r/socket.h b/include/asm-m32r/socket.h
index 793d5d30c8505f03ddb1c0e8801c771177f7e82e..9a0e200122249e5cae09d90d73b01d820dbe9e83 100644 (file)
--- a/include/asm-m32r/socket.h
+++ b/include/asm-m32r/socket.h
@@ -52,4 +52,6 @@
 #define SO_TIMESTAMPNS         35
 #define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
+#define SO_MARK                        36
+
 #endif /* _ASM_M32R_SOCKET_H */