Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasem...

[linux-2.6] / include / asm-avr32 / socket.h

diff --git a/include/asm-avr32/socket.h b/include/asm-avr32/socket.h
index 543229de8173e81a1534181eeb58c93c3063c09d..a0d0507a5034969b70bbc1139631ef5f4cdc077d 100644 (file)
--- a/include/asm-avr32/socket.h
+++ b/include/asm-avr32/socket.h
@@ -49,5 +49,7 @@
 
 #define SO_PEERSEC             31
 #define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* __ASM_AVR32_SOCKET_H */