Merge branches 'release' and 'doc' into release

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

diff --git a/include/asm-arm/sockios.h b/include/asm-arm/sockios.h
index 77c34087d513d00d9ced5cb380235c85502ff50a..a2588a2512dfc76aee67f9b9e27b0b07cf4525f9 100644 (file)
--- a/include/asm-arm/sockios.h
+++ b/include/asm-arm/sockios.h
@@ -7,6 +7,7 @@
 #define FIOGETOWN      0x8903
 #define SIOCGPGRP      0x8904
 #define SIOCATMARK     0x8905
-#define SIOCGSTAMP     0x8906          /* Get stamp */
+#define SIOCGSTAMP     0x8906          /* Get stamp (timeval) */
+#define SIOCGSTAMPNS   0x8907          /* Get stamp (timespec) */
 
 #endif