summaryrefslogtreecommitdiffstats
path: root/include/asm-v850/sockios.h
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2007-05-01 08:53:01 +0200
committerWim Van Sebroeck <wim@iguana.be>2007-05-01 08:53:01 +0200
commit48a7afe314bfc4d7f50e1608632f503dbba7e013 (patch)
tree4a80e6b96321a71affd1bacea817de93be08894b /include/asm-v850/sockios.h
parent[WATCHDOG] Semi-typical watchdog bug re early misc_register() (diff)
parentlibata: honour host controllers that want just one host (diff)
downloadlinux-48a7afe314bfc4d7f50e1608632f503dbba7e013.tar.xz
linux-48a7afe314bfc4d7f50e1608632f503dbba7e013.zip
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-v850/sockios.h')
-rw-r--r--include/asm-v850/sockios.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-v850/sockios.h b/include/asm-v850/sockios.h
index cf4874c2fd8a..823e106e6cd0 100644
--- a/include/asm-v850/sockios.h
+++ b/include/asm-v850/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 /* __V850_SOCKIOS_H__ */