Merge branch 'linus' into cpus4096

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

diff --git a/include/asm-powerpc/sockios.h b/include/asm-powerpc/sockios.h
index 590078d8ed28da51c46bcfbfbd03fc87b2962b3a..55cef7675a31c29210c3d36221f8c8c424cddac9 100644 (file)
--- a/include/asm-powerpc/sockios.h
+++ b/include/asm-powerpc/sockios.h
@@ -14,6 +14,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 /* _ASM_POWERPC_SOCKIOS_H */