Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[sfrench/cifs-2.6.git] / include / asm-avr32 / socket.h

diff --git a/include/asm-avr32/socket.h b/include/asm-avr32/socket.h
index a0d0507a5034969b70bbc1139631ef5f4cdc077d..35863f260929abe002d57f154c3d5749b2ce1d69 100644 (file)
--- a/include/asm-avr32/socket.h
+++ b/include/asm-avr32/socket.h
@@ -52,4 +52,6 @@
 #define SO_TIMESTAMPNS         35
 #define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
+#define SO_MARK                        36
+
 #endif /* __ASM_AVR32_SOCKET_H */