Merge git://git.infradead.org/battery-2.6

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

diff --git a/include/asm-arm/socket.h b/include/asm-arm/socket.h
index 3c51da6438c95b6734e38243ebdbb21af5a6972a..65a1a64bf9340b2b8ec8d4321d26c1deb968739a 100644 (file)
--- a/include/asm-arm/socket.h
+++ b/include/asm-arm/socket.h
@@ -48,5 +48,8 @@
 #define SO_ACCEPTCONN          30
 
 #define SO_PEERSEC             31
+#define SO_PASSSEC             34
+#define SO_TIMESTAMPNS         35
+#define SCM_TIMESTAMPNS                SO_TIMESTAMPNS
 
 #endif /* _ASM_SOCKET_H */